X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/984c6dc1142bbfaf11b1a2749d23f7edf7d1a83b..83b93b9c5a1439ded467171b834208aa8b00dcbb:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index ef7b44f0d..fe70cbfc5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,67 +2,67 @@ GEM remote: http://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (4.0.0) - actionpack (= 4.0.0) - mail (~> 2.5.3) - actionpack (4.0.0) - activesupport (= 4.0.0) + actionmailer (4.0.2) + actionpack (= 4.0.2) + mail (~> 2.5.4) + actionpack (4.0.2) + activesupport (= 4.0.2) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionpack-page_caching (1.0.0) - actionpack (>= 4.0.0.beta, < 5.0) - activemodel (4.0.0) - activesupport (= 4.0.0) + actionpack-page_caching (1.0.2) + actionpack (>= 4.0.0, < 5) + activemodel (4.0.2) + activesupport (= 4.0.2) builder (~> 3.1.0) - activerecord (4.0.0) - activemodel (= 4.0.0) + activerecord (4.0.2) + activemodel (= 4.0.2) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.0) + activesupport (= 4.0.2) arel (~> 4.0.0) activerecord-deprecated_finders (1.0.3) - activesupport (4.0.0) + activesupport (4.0.2) i18n (~> 0.6, >= 0.6.4) minitest (~> 4.2) multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) - arel (4.0.0) - atomic (1.1.13) + arel (4.0.1) + atomic (1.1.14) bigdecimal (1.1.0) builder (3.1.4) climate_control (0.0.3) activesupport (>= 3.0) - cocaine (0.5.1) + cocaine (0.5.3) climate_control (>= 0.0.3, < 1.0) - coffee-rails (4.0.0) + coffee-rails (4.0.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0.beta, < 5.0) + railties (>= 4.0.0, < 5.0) coffee-script (2.2.0) coffee-script-source execjs coffee-script-source (1.6.3) - composite_primary_keys (6.0.0) + composite_primary_keys (6.0.1) activerecord (>= 4.0.0) + dalli (2.6.4) deadlock_retry (1.2.0) dynamic_form (1.1.4) - ejs (1.1.1) erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) + execjs (2.0.2) faraday (0.8.8) multipart-post (~> 1.2.0) hike (1.2.3) htmlentities (4.3.1) - http_accept_language (1.0.2) + http_accept_language (2.0.0) httpauth (0.2.0) httpclient (2.3.4.1) - i18n (0.6.5) + i18n (0.6.9) iconv (0.1) jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) + json (1.8.1) jsonify (0.3.1) multi_json (~> 1.0) jsonify-rails (0.3.2) @@ -70,20 +70,25 @@ GEM jsonify (< 0.4.0) jwt (0.1.8) multi_json (>= 1.5) + kgio (2.8.1) libxml-ruby (2.7.0) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - memcached (1.7.0) - mime-types (1.24) - mini_portile (0.5.1) + mime-types (1.25.1) + mini_portile (0.5.2) minitest (4.7.5) - multi_json (1.7.9) + multi_json (1.8.2) multi_xml (0.5.5) multipart-post (1.2.0) nokogiri (1.6.0) mini_portile (~> 0.5.0) oauth (0.4.7) + oauth-plugin (0.5.1) + multi_json + oauth (~> 0.4.4) + oauth2 (>= 0.5.0) + rack oauth2 (0.9.2) faraday (~> 0.8) httpauth (~> 0.2) @@ -91,79 +96,74 @@ GEM multi_json (~> 1.0) multi_xml (~> 0.5) rack (~> 1.2) - open_id_authentication (1.1.0) + open_id_authentication (1.2.0) rack-openid (~> 1.3) openstreetmap-i18n-js (3.0.0.rc5.2) i18n - openstreetmap-oauth-plugin (0.4.1.2) - multi_json - oauth (~> 0.4.4) - oauth2 (>= 0.5.0) - rack - paperclip (2.8.0) - activerecord (>= 2.3.0) - activesupport (>= 2.3.2) - cocaine (>= 0.0.2) + paperclip (3.5.2) + activemodel (>= 3.0.0) + activesupport (>= 3.0.0) + cocaine (~> 0.5.3) mime-types - pg (0.16.0) + pg (0.17.0) polyglot (0.3.3) - psych (2.0.0) + psych (2.0.2) r2 (0.2.2) rack (1.5.2) - rack-cors (0.2.8) - rack - rack-openid (1.3.1) + rack-cors (0.2.9) + rack-openid (1.4.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (0.6.2) rack (>= 1.0) - rails (4.0.0) - actionmailer (= 4.0.0) - actionpack (= 4.0.0) - activerecord (= 4.0.0) - activesupport (= 4.0.0) + rails (4.0.2) + actionmailer (= 4.0.2) + actionpack (= 4.0.2) + activerecord (= 4.0.2) + activesupport (= 4.0.2) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.0) + railties (= 4.0.2) sprockets-rails (~> 2.0.0) - rails-i18n (0.7.4) - i18n (~> 0.5) - railties (4.0.0) - actionpack (= 4.0.0) - activesupport (= 4.0.0) + rails-i18n (4.0.0) + i18n (~> 0.6) + rails (~> 4.0.0) + railties (4.0.2) + actionpack (= 4.0.2) + activesupport (= 4.0.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.1.0) redcarpet (3.0.0) rinku (1.7.3) - ruby-openid (2.2.3) + ruby-openid (2.3.0) sanitize (2.0.6) nokogiri (>= 1.4.4) - sass (3.2.10) - sass-rails (4.0.0) - railties (>= 4.0.0.beta, < 5.0) + sass (3.2.12) + sass-rails (4.0.1) + railties (>= 4.0.0, < 5.0) sass (>= 3.1.10) sprockets-rails (~> 2.0.0) - sprockets (2.10.0) + sprockets (2.10.1) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.0) + sprockets-rails (2.0.1) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) thor (0.18.1) - thread_safe (0.1.2) + thread_safe (0.1.3) atomic tilt (1.4.1) - timecop (0.6.3) - treetop (1.4.14) + timecop (0.7.0) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.37) - uglifier (2.1.2) + tzinfo (0.3.38) + uglifier (2.3.2) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) + json (>= 1.8.0) validates_email_format_of (1.5.3) vendorer (0.1.14) @@ -175,29 +175,30 @@ DEPENDENCIES actionpack-page_caching bigdecimal (~> 1.1.0) coffee-rails (~> 4.0.0) - composite_primary_keys (>= 6.0.0) + composite_primary_keys (>= 6.0.1) + dalli deadlock_retry (>= 1.2.0) dynamic_form - ejs htmlentities - http_accept_language (>= 1.0.2) + http_accept_language (~> 2.0.0) httpclient iconv (= 0.1) jquery-rails + json jsonify-rails + kgio libxml-ruby (>= 2.0.5) - memcached (>= 1.4.1) minitest (~> 4.7.0) + oauth-plugin (>= 0.5.1) open_id_authentication (>= 1.1.0) openstreetmap-i18n-js (>= 3.0.0.rc5.2) - openstreetmap-oauth-plugin (>= 0.4.1.1) - paperclip (~> 2.0) + paperclip (~> 3.0) pg psych r2 rack-cors - rails (= 4.0.0) - rails-i18n (>= 0.6.3) + rails (= 4.0.2) + rails-i18n (~> 4.0.0) redcarpet rinku (>= 1.2.2) ruby-openid (>= 2.2.0)