X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/726c149bd507210543d5b31504c37f45a7d9a07e..899891fe8a16934ab98b16456ea95d9f9c81587d:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 08e32900e..3473ee532 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.3) + actionpack (= 4.2.3) + actionview (= 4.2.3) + activejob (= 4.2.3) 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.3) + actionview (= 4.2.3) + activesupport (= 4.2.3) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) + rails-html-sanitizer (~> 1.0, >= 1.0.2) actionpack-page_caching (1.0.2) actionpack (>= 4.0.0, < 5) - actionview (4.2.1) - activesupport (= 4.2.1) + actionview (4.2.3) + activesupport (= 4.2.3) 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) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.3) + activesupport (= 4.2.3) globalid (>= 0.3.0) - activemodel (4.2.1) - activesupport (= 4.2.1) + activemodel (4.2.3) + activesupport (= 4.2.3) builder (~> 3.1) - activerecord (4.2.1) - activemodel (= 4.2.1) - activesupport (= 4.2.1) + activerecord (4.2.3) + activemodel (= 4.2.3) + activesupport (= 4.2.3) arel (~> 6.0) - activesupport (4.2.1) + activesupport (4.2.3) 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.2.0) + autoprefixer-rails (5.2.1) execjs json bigdecimal (1.1.0) @@ -69,7 +69,7 @@ GEM colorize (0.7.7) composite_primary_keys (8.1.0) activerecord (~> 4.2.0) - coveralls (0.8.1) + coveralls (0.8.2) json (~> 1.8) rest-client (>= 1.6.8, < 2) simplecov (~> 0.10.0) @@ -96,7 +96,9 @@ GEM 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.rc11) + i18n (~> 0.6) + jquery-rails (4.0.4) rails-dom-testing (~> 1.0) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -110,7 +112,7 @@ GEM jsonify-rails (0.3.2) actionpack jsonify (< 0.4.0) - jwt (1.5.0) + jwt (1.5.1) kgio (2.9.3) konacha (3.5.1) actionpack (>= 3.1, < 5) @@ -126,9 +128,10 @@ GEM mail (2.6.3) mime-types (>= 1.16, < 3) mime-types (2.6.1) + mimemagic (0.3.0) mini_portile (0.6.2) minitest (5.7.0) - multi_json (1.11.0) + multi_json (1.11.1) multi_xml (0.5.5) multipart-post (2.0.0) netrc (0.10.3) @@ -153,7 +156,7 @@ GEM rack (~> 1.0) omniauth-facebook (2.0.1) omniauth-oauth2 (~> 1.2) - omniauth-oauth2 (1.3.0) + omniauth-oauth2 (1.3.1) oauth2 (~> 1.0) omniauth (~> 1.2) omniauth-openid (1.0.1) @@ -162,19 +165,18 @@ GEM omniauth-windowslive (0.0.9) multi_json (>= 1.0.3) omniauth-oauth2 (~> 1.0) - openstreetmap-i18n-js (3.0.0.rc5.3) - i18n 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) + paperclip (4.3.0) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + cocaine (~> 0.5.5) mime-types - parser (2.2.2.5) + mimemagic (= 0.3.0) + parser (2.3.0.pre.2) ast (>= 1.1, < 3.0) pg (0.18.2) poltergeist (1.6.0) @@ -185,23 +187,23 @@ GEM powerpack (0.1.1) psych (2.0.13) r2 (0.2.5) - rack (1.6.1) + rack (1.6.4) 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.3) + actionmailer (= 4.2.3) + actionpack (= 4.2.3) + actionview (= 4.2.3) + activejob (= 4.2.3) + activemodel (= 4.2.3) + activerecord (= 4.2.3) + activesupport (= 4.2.3) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.1) + railties (= 4.2.3) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -214,21 +216,21 @@ 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.3) + actionpack (= 4.2.3) + activesupport (= 4.2.3) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.0.0) rake (10.4.2) - redcarpet (3.3.0) + redcarpet (3.3.2) ref (1.0.5) 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.32.0) + rubocop (0.32.1) astrolabe (~> 1.3) parser (>= 2.2.2.5, < 3.0) powerpack (~> 0.1) @@ -240,7 +242,7 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (= 1.4.1) - sass (3.4.14) + sass (3.4.15) sass-rails (5.0.3) railties (>= 4.0.0, < 5.0) sass (~> 3.1) @@ -253,16 +255,16 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.0) soap4r-ruby1.9 (2.0.5) - sprockets (2.12.3) + sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.3.1) + sprockets-rails (2.3.2) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - term-ansicolor (1.3.0) + term-ansicolor (1.3.2) tins (~> 1.0) therubyracer (0.12.2) libv8 (~> 3.16.14.0) @@ -271,7 +273,7 @@ GEM thread_safe (0.3.5) tilt (1.4.1) timecop (0.7.4) - tins (1.5.2) + tins (1.5.4) tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (2.7.1) @@ -307,6 +309,7 @@ DEPENDENCIES htmlentities http_accept_language (~> 2.0.0) httpclient + i18n-js (>= 3.0.0.rc10) jquery-rails jshint json @@ -320,7 +323,6 @@ DEPENDENCIES omniauth-facebook omniauth-openid omniauth-windowslive - openstreetmap-i18n-js (>= 3.0.0.rc5.3) openstreetmap-omniauth-google-oauth2 (>= 0.2.6.1) paperclip (~> 4.0) pg @@ -328,7 +330,7 @@ DEPENDENCIES psych r2 rack-cors - rails (= 4.2.1) + rails (= 4.2.3) rails-i18n (~> 4.0.0) redcarpet rinku (>= 1.2.2)