X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c53db246f606e0233a524e8f3c6390ea74e96890..9c7e0e13d79248830a4041877ccdcdb3981a0b7b:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 3bd4682a4..48d6013bf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,38 +2,40 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (4.1.4) - actionpack (= 4.1.4) - actionview (= 4.1.4) - mail (~> 2.5.4) - actionpack (4.1.4) - actionview (= 4.1.4) - activesupport (= 4.1.4) + actionmailer (4.1.6) + actionpack (= 4.1.6) + actionview (= 4.1.6) + mail (~> 2.5, >= 2.5.4) + actionpack (4.1.6) + actionview (= 4.1.6) + activesupport (= 4.1.6) rack (~> 1.5.2) rack-test (~> 0.6.2) actionpack-page_caching (1.0.2) actionpack (>= 4.0.0, < 5) - actionview (4.1.4) - activesupport (= 4.1.4) + actionview (4.1.6) + activesupport (= 4.1.6) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.4) - activesupport (= 4.1.4) + activemodel (4.1.6) + activesupport (= 4.1.6) builder (~> 3.1) - activerecord (4.1.4) - activemodel (= 4.1.4) - activesupport (= 4.1.4) + activerecord (4.1.6) + activemodel (= 4.1.6) + activesupport (= 4.1.6) arel (~> 5.0.0) - activesupport (4.1.4) + activesupport (4.1.6) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) arel (5.0.1.20140414130214) + autoprefixer-rails (3.1.1.20141001) + execjs bigdecimal (1.1.0) builder (3.2.2) - capybara (2.4.1) + capybara (2.4.3) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -47,14 +49,14 @@ GEM coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.2.0) + coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.7.0) + coffee-script-source (1.8.0) colorize (0.7.3) - composite_primary_keys (7.0.3) - activerecord (~> 4.1.4) - crass (0.2.0) + composite_primary_keys (7.0.11) + activerecord (= 4.1.6) + crass (0.2.1) dalli (2.7.2) deadlock_retry (1.2.0) dynamic_form (1.1.4) @@ -64,11 +66,11 @@ GEM multipart-post (>= 1.2, < 3) hike (1.2.3) htmlentities (4.3.2) - http_accept_language (2.0.1) + http_accept_language (2.0.2) httpclient (2.4.0) - i18n (0.6.9) + i18n (0.6.11) iconv (0.1) - jquery-rails (3.1.1) + jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) @@ -79,25 +81,24 @@ GEM jsonify (< 0.4.0) jwt (1.0.0) kgio (2.9.2) - konacha (3.2.3) + konacha (3.2.4) actionpack (>= 3.1, < 5) capybara colorize railties (>= 3.1, < 5) sprockets libxml-ruby (2.7.0) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.25.1) + mail (2.6.1) + mime-types (>= 1.16, < 3) + mime-types (2.4.1) mini_portile (0.6.0) - minitest (5.3.5) + minitest (5.4.2) multi_json (1.10.1) multi_xml (0.5.5) multipart-post (2.0.0) - nokogiri (1.6.2.1) + nokogiri (1.6.3.1) mini_portile (= 0.6.0) - nokogumbo (1.1.9) + nokogumbo (1.1.12) nokogiri oauth (0.4.7) oauth-plugin (0.5.1) @@ -105,7 +106,7 @@ GEM oauth (~> 0.4.4) oauth2 (>= 0.5.0) rack - oauth2 (0.9.4) + oauth2 (1.0.0) faraday (>= 0.8, < 0.10) jwt (~> 1.0) multi_json (~> 1.3) @@ -115,7 +116,7 @@ GEM rack-openid (~> 1.3) openstreetmap-i18n-js (3.0.0.rc5.3) i18n - paperclip (4.1.1) + paperclip (4.2.0) activemodel (>= 3.0.0) activesupport (>= 3.0.0) cocaine (~> 0.5.3) @@ -126,8 +127,7 @@ GEM cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - polyglot (0.3.5) - psych (2.0.5) + psych (2.0.6) r2 (0.2.5) rack (1.5.2) rack-cors (0.2.9) @@ -136,32 +136,32 @@ GEM ruby-openid (>= 2.1.8) rack-test (0.6.2) rack (>= 1.0) - rails (4.1.4) - actionmailer (= 4.1.4) - actionpack (= 4.1.4) - actionview (= 4.1.4) - activemodel (= 4.1.4) - activerecord (= 4.1.4) - activesupport (= 4.1.4) + rails (4.1.6) + actionmailer (= 4.1.6) + actionpack (= 4.1.6) + actionview (= 4.1.6) + activemodel (= 4.1.6) + activerecord (= 4.1.6) + activesupport (= 4.1.6) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.4) + railties (= 4.1.6) sprockets-rails (~> 2.0) - rails-i18n (4.0.2) + rails-i18n (4.0.3) i18n (~> 0.6) - rails (>= 4.0) - railties (4.1.4) - actionpack (= 4.1.4) - activesupport (= 4.1.4) + railties (~> 4.0) + railties (4.1.6) + actionpack (= 4.1.6) + activesupport (= 4.1.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.3.2) redcarpet (3.1.2) rinku (1.7.3) ruby-openid (2.5.0) - sanitize (3.0.0) + sanitize (3.0.2) crass (~> 0.2.0) nokogiri (>= 1.4.4) - nokogumbo (= 1.1.9) + nokogumbo (= 1.1.12) sass (3.2.19) sass-rails (4.0.3) railties (>= 4.0.0, < 5.0) @@ -174,7 +174,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.1.3) + sprockets-rails (2.1.4) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) @@ -182,17 +182,15 @@ GEM thread_safe (0.3.4) tilt (1.4.1) timecop (0.7.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - tzinfo (1.2.1) + tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.5.1) + uglifier (2.5.3) execjs (>= 0.3.0) json (>= 1.8.0) - validates_email_format_of (1.5.3) + validates_email_format_of (1.6.1) + i18n vendorer (0.1.16) - websocket-driver (0.3.3) + websocket-driver (0.3.5) xpath (2.0.0) nokogiri (~> 1.3) @@ -202,9 +200,10 @@ PLATFORMS DEPENDENCIES SystemTimer (>= 1.1.3) actionpack-page_caching + autoprefixer-rails bigdecimal (~> 1.1.0) coffee-rails (~> 4.0.0) - composite_primary_keys (~> 7.0.3) + composite_primary_keys (~> 7.0.11) dalli deadlock_retry (>= 1.2.0) dynamic_form @@ -228,7 +227,7 @@ DEPENDENCIES psych r2 rack-cors - rails (= 4.1.4) + rails (= 4.1.6) rails-i18n (~> 4.0.0) redcarpet rinku (>= 1.2.2)