X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8368f903101031389c7153623c8858a7a6f2de84..c7061991e74a20cc0576a3afa269821a87178f77:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 83d9ae473..89c838842 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,38 +2,38 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) + actionmailer (4.2.5.1) + actionpack (= 4.2.5.1) + actionview (= 4.2.5.1) + activejob (= 4.2.5.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5) - actionview (= 4.2.5) - activesupport (= 4.2.5) + actionpack (4.2.5.1) + actionview (= 4.2.5.1) + activesupport (= 4.2.5.1) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) actionpack-page_caching (1.0.2) actionpack (>= 4.0.0, < 5) - actionview (4.2.5) - activesupport (= 4.2.5) + actionview (4.2.5.1) + activesupport (= 4.2.5.1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.5) - activesupport (= 4.2.5) + activejob (4.2.5.1) + activesupport (= 4.2.5.1) globalid (>= 0.3.0) - activemodel (4.2.5) - activesupport (= 4.2.5) + activemodel (4.2.5.1) + activesupport (= 4.2.5.1) builder (~> 3.1) - activerecord (4.2.5) - activemodel (= 4.2.5) - activesupport (= 4.2.5) + activerecord (4.2.5.1) + activemodel (= 4.2.5.1) + activesupport (= 4.2.5.1) arel (~> 6.0) - activesupport (4.2.5) + activesupport (4.2.5.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -41,15 +41,14 @@ GEM tzinfo (~> 1.1) addressable (2.4.0) arel (6.0.3) - ast (2.1.0) - astrolabe (1.3.1) - parser (~> 2.2) - autoprefixer-rails (6.1.2) + ast (2.2.0) + autoprefixer-rails (6.3.1) execjs json bigdecimal (1.1.0) builder (3.2.2) - capybara (2.5.0) + capybara (2.6.2) + addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -60,15 +59,15 @@ GEM cliver (0.3.2) cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) - coffee-rails (4.1.0) + coffee-rails (4.1.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) + railties (>= 4.0.0, < 5.1.x) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.10.0) colorize (0.7.7) - composite_primary_keys (8.1.1) + composite_primary_keys (8.1.2) activerecord (~> 4.2.0) concurrent-ruby (1.0.0) coveralls (0.8.10) @@ -79,15 +78,15 @@ GEM thor (~> 0.19.1) tins (~> 1.6.0) crass (1.0.2) - dalli (2.7.4) + dalli (2.7.5) deadlock_retry (1.2.0) docile (1.1.5) - domain_name (0.5.25) + domain_name (0.5.20160128) unf (>= 0.0.5, < 1.0.0) dynamic_form (1.1.4) erubis (2.7.0) execjs (2.6.0) - exifr (1.2.3.1) + exifr (1.2.4) faraday (0.9.2) multipart-post (>= 1.2, < 3) fspath (2.1.1) @@ -98,10 +97,10 @@ GEM http-cookie (1.0.2) domain_name (~> 0.5) http_accept_language (2.0.5) - httpclient (2.7.0.1) + httpclient (2.7.1) i18n (0.7.0) - i18n-js (3.0.0.rc11) - i18n (~> 0.6) + i18n-js (3.0.0.rc12) + i18n (~> 0.6, >= 0.6.6) image_optim (0.22.0) exifr (~> 1.2, >= 1.2.2) fspath (~> 2.1) @@ -110,7 +109,7 @@ GEM progress (~> 3.0, >= 3.0.1) image_size (1.4.1) in_threads (1.3.1) - jquery-rails (4.0.5) + jquery-rails (4.1.0) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -124,7 +123,7 @@ GEM jsonify-rails (0.3.2) actionpack jsonify (< 0.4.0) - jwt (1.5.2) + jwt (1.5.1) kgio (2.10.0) konacha (3.7.0) actionpack (>= 3.1, < 5) @@ -148,14 +147,14 @@ GEM mime-types (2.99) mimemagic (0.3.0) mini_portile2 (2.0.0) - minitest (5.8.3) + minitest (5.8.4) multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) netrc (0.11.0) - nokogiri (1.6.7) + nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) - nokogumbo (1.4.1) + nokogumbo (1.4.7) nokogiri oauth (0.4.7) oauth-plugin (0.5.1) @@ -163,24 +162,23 @@ GEM oauth (~> 0.4.4) oauth2 (>= 0.5.0) rack - oauth2 (1.0.0) + oauth2 (1.1.0) faraday (>= 0.8, < 0.10) - jwt (~> 1.0) + jwt (~> 1.0, < 1.5.2) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (~> 1.2) - omniauth (1.2.2) + rack (>= 1.2, < 3) + omniauth (1.3.1) hashie (>= 1.2, < 4) - rack (~> 1.0) + rack (>= 1.0, < 3) omniauth-facebook (3.0.0) omniauth-oauth2 (~> 1.2) - omniauth-google-oauth2 (0.2.10) - addressable (~> 2.3) + omniauth-google-oauth2 (0.3.1) jwt (~> 1.0) multi_json (~> 1.3) omniauth (>= 1.1.1) - omniauth-oauth2 (~> 1.3.1) - omniauth-oauth2 (1.3.1) + omniauth-oauth2 (>= 1.3.1) + omniauth-oauth2 (1.4.0) oauth2 (~> 1.0) omniauth (~> 1.2) omniauth-openid (1.0.1) @@ -189,23 +187,23 @@ GEM omniauth-windowslive (0.0.9.1) multi_json (>= 1.0.3) omniauth-oauth2 (~> 1.0) - paperclip (4.3.2) + paperclip (4.3.4) activemodel (>= 3.2.0) activesupport (>= 3.2.0) cocaine (~> 0.5.5) mime-types mimemagic (= 0.3.0) - parser (2.2.3.0) - ast (>= 1.1, < 3.0) + parser (2.3.0.2) + ast (~> 2.2) pg (0.18.4) - poltergeist (1.8.1) + poltergeist (1.9.0) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) powerpack (0.1.1) - progress (3.1.0) - psych (2.0.15) + progress (3.1.1) + psych (2.0.17) r2 (0.2.6) rack (1.6.4) rack-cors (0.4.0) @@ -215,16 +213,16 @@ GEM rack-test (0.6.3) rack (>= 1.0) rack-uri_sanitizer (0.0.2) - rails (4.2.5) - actionmailer (= 4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) - activemodel (= 4.2.5) - activerecord (= 4.2.5) - activesupport (= 4.2.5) + rails (4.2.5.1) + actionmailer (= 4.2.5.1) + actionpack (= 4.2.5.1) + actionview (= 4.2.5.1) + activejob (= 4.2.5.1) + activemodel (= 4.2.5.1) + activerecord (= 4.2.5.1) + activesupport (= 4.2.5.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5) + railties (= 4.2.5.1) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -232,53 +230,52 @@ GEM activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.2) + rails-html-sanitizer (1.0.3) loofah (~> 2.0) - rails-i18n (4.0.7) + rails-i18n (4.0.8) i18n (~> 0.7) railties (~> 4.0) - railties (4.2.5) - actionpack (= 4.2.5) - activesupport (= 4.2.5) + railties (4.2.5.1) + actionpack (= 4.2.5.1) + activesupport (= 4.2.5.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.0.0) - rake (10.4.2) - redcarpet (3.3.3) + rainbow (2.1.0) + rake (10.5.0) + redcarpet (3.3.4) ref (2.0.0) - request_store (1.2.1) + request_store (1.3.0) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) rinku (1.7.3) - rubocop (0.35.1) - astrolabe (~> 1.3) - parser (>= 2.2.3.0, < 3.0) + rubocop (0.37.0) + parser (>= 2.3.0.2, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) - tins (<= 1.6.0) + unicode-display_width (~> 0.3) ruby-openid (2.7.0) ruby-progressbar (1.7.5) - sanitize (4.0.0) + sanitize (4.0.1) crass (~> 1.0.2) nokogiri (>= 1.4.4) - nokogumbo (= 1.4.1) - sass (3.4.19) + nokogumbo (~> 1.4.1) + sass (3.4.21) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - simplecov (0.11.1) + simplecov (0.11.2) docile (~> 1.1.0) json (~> 1.8) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) soap4r-ruby1.9 (2.0.5) - sprockets (3.5.1) + sprockets (3.5.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (2.3.3) @@ -292,7 +289,7 @@ GEM ref thor (0.19.1) thread_safe (0.3.5) - tilt (2.0.1) + tilt (2.0.2) timecop (0.8.0) tins (1.6.0) tzinfo (1.2.2) @@ -302,7 +299,8 @@ GEM json (>= 1.8.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.1) + unf_ext (0.0.7.2) + unicode-display_width (0.3.1) validates_email_format_of (1.6.3) i18n vendorer (0.1.16) @@ -354,7 +352,7 @@ DEPENDENCIES r2 rack-cors rack-uri_sanitizer - rails (= 4.2.5) + rails (= 4.2.5.1) rails-i18n (~> 4.0.0) redcarpet rinku (>= 1.2.2) @@ -362,6 +360,7 @@ DEPENDENCIES sanitize sass-rails (~> 5.0) soap4r-ruby1.9 + sprockets-rails (< 3) timecop uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1)