X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/65bbf6b626c0b9bbe34068510bd5e93729fd7b5a..12e22c5de32d287f43ccdc428a2fb13406f0fefb:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 2268cda56..a19d2e7fa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,38 +2,38 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (4.2.1) - actionpack (= 4.2.1) - actionview (= 4.2.1) - activejob (= 4.2.1) + actionmailer (4.2.2) + actionpack (= 4.2.2) + actionview (= 4.2.2) + activejob (= 4.2.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.1) - actionview (= 4.2.1) - activesupport (= 4.2.1) + actionpack (4.2.2) + actionview (= 4.2.2) + activesupport (= 4.2.2) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.1) actionpack-page_caching (1.0.2) actionpack (>= 4.0.0, < 5) - actionview (4.2.1) - activesupport (= 4.2.1) + actionview (4.2.2) + activesupport (= 4.2.2) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.1) - activejob (4.2.1) - activesupport (= 4.2.1) + activejob (4.2.2) + activesupport (= 4.2.2) globalid (>= 0.3.0) - activemodel (4.2.1) - activesupport (= 4.2.1) + activemodel (4.2.2) + activesupport (= 4.2.2) builder (~> 3.1) - activerecord (4.2.1) - activemodel (= 4.2.1) - activesupport (= 4.2.1) + activerecord (4.2.2) + activemodel (= 4.2.2) + activesupport (= 4.2.2) arel (~> 6.0) - activesupport (4.2.1) + activesupport (4.2.2) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -43,7 +43,7 @@ GEM ast (2.0.0) astrolabe (1.3.0) parser (>= 2.2.0.pre.3, < 3.0) - autoprefixer-rails (5.1.7.1) + autoprefixer-rails (5.2.0) execjs json bigdecimal (1.1.0) @@ -62,37 +62,43 @@ GEM coffee-rails (4.1.0) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.3.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1) - colorize (0.7.5) + coffee-script-source (1.9.1.1) + colorize (0.7.7) composite_primary_keys (8.1.0) activerecord (~> 4.2.0) - coveralls (0.7.11) - multi_json (~> 1.10) + coveralls (0.8.1) + json (~> 1.8) rest-client (>= 1.6.8, < 2) - simplecov (~> 0.9.1) + simplecov (~> 0.10.0) term-ansicolor (~> 1.3) thor (~> 0.19.1) - crass (1.0.1) + crass (1.0.2) dalli (2.7.4) deadlock_retry (1.2.0) docile (1.1.5) + domain_name (0.5.24) + unf (>= 0.0.5, < 1.0.0) dynamic_form (1.1.4) erubis (2.7.0) - execjs (2.4.0) + execjs (2.5.2) faraday (0.9.1) multipart-post (>= 1.2, < 3) - globalid (0.3.3) + globalid (0.3.5) activesupport (>= 4.1.0) - hashie (3.4.0) + hashie (3.4.2) hike (1.2.3) htmlentities (4.3.3) + http-cookie (1.0.2) + domain_name (~> 0.5) http_accept_language (2.0.5) httpclient (2.6.0.1) i18n (0.7.0) - jquery-rails (4.0.3) + i18n-js (3.0.0.rc10) + i18n (~> 0.6) + jquery-rails (4.0.4) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -100,36 +106,37 @@ GEM execjs (>= 1.4.0) multi_json (~> 1.0) therubyracer (~> 0.12.1) - json (1.8.2) + json (1.8.3) jsonify (0.3.1) multi_json (~> 1.0) jsonify-rails (0.3.2) actionpack jsonify (< 0.4.0) - jwt (1.4.1) + jwt (1.5.0) kgio (2.9.3) - konacha (3.3.0) + konacha (3.5.1) actionpack (>= 3.1, < 5) capybara colorize railties (>= 3.1, < 5) - sprockets + sprockets (>= 2, < 4) + tilt libv8 (3.16.14.7) libxml-ruby (2.8.0) - loofah (2.0.1) + loofah (2.0.2) nokogiri (>= 1.5.9) mail (2.6.3) mime-types (>= 1.16, < 3) - mime-types (2.4.3) + mime-types (2.6.1) mini_portile (0.6.2) - minitest (5.5.1) - multi_json (1.11.0) + minitest (5.7.0) + multi_json (1.11.1) multi_xml (0.5.5) multipart-post (2.0.0) netrc (0.10.3) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) - nokogumbo (1.2.0) + nokogumbo (1.4.1) nokogiri oauth (0.4.7) oauth-plugin (0.5.1) @@ -146,44 +153,55 @@ GEM omniauth (1.2.2) hashie (>= 1.2, < 4) rack (~> 1.0) + omniauth-facebook (2.0.1) + omniauth-oauth2 (~> 1.2) + omniauth-oauth2 (1.3.0) + oauth2 (~> 1.0) + omniauth (~> 1.2) omniauth-openid (1.0.1) omniauth (~> 1.0) rack-openid (~> 1.3.1) - openstreetmap-i18n-js (3.0.0.rc5.3) - i18n - paperclip (4.2.1) + omniauth-windowslive (0.0.9) + multi_json (>= 1.0.3) + omniauth-oauth2 (~> 1.0) + openstreetmap-omniauth-google-oauth2 (0.2.6.1) + jwt (~> 1.0) + multi_json (~> 1.3) + omniauth (>= 1.1.1) + omniauth-oauth2 (>= 1.1.1) + paperclip (4.2.2) activemodel (>= 3.0.0) activesupport (>= 3.0.0) cocaine (~> 0.5.3) mime-types - parser (2.2.0.3) + parser (2.2.2.5) ast (>= 1.1, < 3.0) - pg (0.18.1) + pg (0.18.2) poltergeist (1.6.0) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - powerpack (0.1.0) + powerpack (0.1.1) psych (2.0.13) r2 (0.2.5) - rack (1.6.0) - rack-cors (0.3.1) + rack (1.6.2) + rack-cors (0.4.0) rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.1) - actionmailer (= 4.2.1) - actionpack (= 4.2.1) - actionview (= 4.2.1) - activejob (= 4.2.1) - activemodel (= 4.2.1) - activerecord (= 4.2.1) - activesupport (= 4.2.1) + rails (4.2.2) + actionmailer (= 4.2.2) + actionpack (= 4.2.2) + actionview (= 4.2.2) + activejob (= 4.2.2) + activemodel (= 4.2.2) + activerecord (= 4.2.2) + activesupport (= 4.2.2) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.1) + railties (= 4.2.2) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -196,72 +214,76 @@ GEM rails-i18n (4.0.4) i18n (~> 0.6) railties (~> 4.0) - railties (4.2.1) - actionpack (= 4.2.1) - activesupport (= 4.2.1) + railties (4.2.2) + actionpack (= 4.2.2) + activesupport (= 4.2.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.0.0) rake (10.4.2) - redcarpet (3.2.2) + redcarpet (3.3.1) ref (1.0.5) - rest-client (1.7.3) + 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.29.1) + rubocop (0.32.0) astrolabe (~> 1.3) - parser (>= 2.2.0.1, < 3.0) + parser (>= 2.2.2.5, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) ruby-openid (2.7.0) - ruby-progressbar (1.7.1) - sanitize (3.1.2) - crass (~> 1.0.1) + ruby-progressbar (1.7.5) + sanitize (4.0.0) + crass (~> 1.0.2) nokogiri (>= 1.4.4) - nokogumbo (= 1.2.0) - sass (3.4.13) - sass-rails (5.0.1) + nokogumbo (= 1.4.1) + sass (3.4.14) + sass-rails (5.0.3) railties (>= 4.0.0, < 5.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (~> 1.1) - simplecov (0.9.2) + simplecov (0.10.0) docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.9.0) - simplecov-html (0.9.0) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) soap4r-ruby1.9 (2.0.5) sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.4) + sprockets-rails (2.3.1) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) term-ansicolor (1.3.0) tins (~> 1.0) - therubyracer (0.12.1) + therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) - timecop (0.7.3) - tins (1.3.5) + timecop (0.7.4) + tins (1.5.2) tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (2.7.1) execjs (>= 0.3.0) json (>= 1.8.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.1) validates_email_format_of (1.6.2) i18n vendorer (0.1.16) - websocket-driver (0.5.3) + websocket-driver (0.5.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) xpath (2.0.0) @@ -285,6 +307,7 @@ DEPENDENCIES htmlentities http_accept_language (~> 2.0.0) httpclient + i18n-js (>= 3.0.0.rc10) jquery-rails jshint json @@ -295,15 +318,17 @@ DEPENDENCIES minitest (~> 5.1) oauth-plugin (>= 0.5.1) omniauth + omniauth-facebook omniauth-openid - openstreetmap-i18n-js (>= 3.0.0.rc5.3) + omniauth-windowslive + openstreetmap-omniauth-google-oauth2 (>= 0.2.6.1) paperclip (~> 4.0) pg poltergeist psych r2 rack-cors - rails (= 4.2.1) + rails (= 4.2.2) rails-i18n (~> 4.0.0) redcarpet rinku (>= 1.2.2) @@ -311,6 +336,7 @@ DEPENDENCIES sanitize sass-rails (~> 5.0) soap4r-ruby1.9 + sprockets (~> 2.12.3) timecop uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1)