X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bda393e7e2604ae17b884cfd577438e34197ba5c..e825f8b2647fb1bc62fb017149930b94ec4d4ea2:/Gemfile.lock?ds=inline diff --git a/Gemfile.lock b/Gemfile.lock index 07f3b5bee..dd565f1ad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,190 +2,209 @@ GEM remote: http://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (3.2.6) - actionpack (= 3.2.6) - mail (~> 2.4.4) - actionpack (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - builder (~> 3.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) - journey (~> 1.0.1) - rack (~> 1.4.0) - rack-cache (~> 1.2) - rack-test (~> 0.6.1) - sprockets (~> 2.1.3) - activemodel (3.2.6) - activesupport (= 3.2.6) - builder (~> 3.0.0) - activerecord (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - arel (~> 3.0.2) - tzinfo (~> 0.3.29) - activeresource (3.2.6) - activemodel (= 3.2.6) - activesupport (= 3.2.6) - activesupport (3.2.6) - i18n (~> 0.6) - multi_json (~> 1.0) - arel (3.0.2) + rack (~> 1.5.2) + rack-test (~> 0.6.2) + 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.2) + activemodel (= 4.0.2) + activerecord-deprecated_finders (~> 1.0.2) + activesupport (= 4.0.2) + arel (~> 4.0.0) + activerecord-deprecated_finders (1.0.3) + 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.1) + atomic (1.1.14) bigdecimal (1.1.0) - browser (0.1.4) - builder (3.0.0) - cocaine (0.2.1) - coffee-rails (3.2.2) + builder (3.1.4) + climate_control (0.0.3) + activesupport (>= 3.0) + cocaine (0.5.3) + climate_control (>= 0.0.3, < 1.0) + coffee-rails (4.0.1) coffee-script (>= 2.2.0) - railties (~> 3.2.0) + railties (>= 4.0.0, < 5.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.3.3) - composite_primary_keys (5.0.8) - activerecord (~> 3.2.0) + coffee-script-source (1.6.3) + composite_primary_keys (6.0.1) + activerecord (>= 4.0.0) + dalli (2.6.4) deadlock_retry (1.2.0) dynamic_form (1.1.4) erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) - faraday (0.8.1) - multipart-post (~> 1.1) - hike (1.2.1) + execjs (2.0.2) + faraday (0.9.0) + multipart-post (>= 1.2, < 3) + hike (1.2.3) htmlentities (4.3.1) - http_accept_language (1.0.2) - httpauth (0.1) - httpclient (2.2.5) - i18n (0.6.0) + http_accept_language (2.0.0) + httpclient (2.3.4.1) + i18n (0.6.9) iconv (0.1) - journey (1.0.4) - jquery-rails (2.0.2) - railties (>= 3.2.0, < 5.0) - thor (~> 0.14) - json (1.7.3) - jwt (0.1.4) - json (>= 1.2.4) - libv8 (3.3.10.4) - libxml-ruby (2.3.3) - mail (2.4.4) - i18n (>= 0.4.0) + 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) + actionpack + jsonify (< 0.4.0) + jwt (0.1.11) + 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.4.2) - mime-types (1.19) - minitest (3.2.0) - multi_json (1.3.6) - multipart-post (1.1.5) - nokogiri (1.5.5) - oauth (0.4.6) - oauth2 (0.8.0) - faraday (~> 0.8) - httpauth (~> 0.1) - jwt (~> 0.1.4) - multi_json (~> 1.0) - rack (~> 1.2) - open_id_authentication (1.1.0) - rack-openid (~> 1.3) - openstreetmap-oauth-plugin (0.4.0.1) + mime-types (1.25.1) + mini_portile (0.5.2) + minitest (4.7.5) + multi_json (1.8.4) + multi_xml (0.5.5) + multipart-post (2.0.0) + nokogiri (1.6.1) + 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 - paperclip (2.7.0) - activerecord (>= 2.3.0) - activesupport (>= 2.3.2) - cocaine (>= 0.0.2) + oauth2 (0.9.3) + faraday (>= 0.8, < 0.10) + jwt (~> 0.1.8) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (~> 1.2) + open_id_authentication (1.2.0) + rack-openid (~> 1.3) + openstreetmap-i18n-js (3.0.0.rc5.3) + i18n + paperclip (3.5.2) + activemodel (>= 3.0.0) + activesupport (>= 3.0.0) + cocaine (~> 0.5.3) mime-types - pg (0.14.0) + pg (0.17.1) polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.2) - rack (>= 0.4) - rack-openid (1.3.1) + psych (2.0.2) + r2 (0.2.2) + rack (1.5.2) + rack-cors (0.2.9) + rack-openid (1.4.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-ssl (1.3.2) - rack - rack-test (0.6.1) + rack-test (0.6.2) rack (>= 1.0) - rails (3.2.6) - actionmailer (= 3.2.6) - actionpack (= 3.2.6) - activerecord (= 3.2.6) - activeresource (= 3.2.6) - activesupport (= 3.2.6) - bundler (~> 1.0) - railties (= 3.2.6) - rails-i18n (0.6.5) - i18n (~> 0.5) - railties (3.2.6) - actionpack (= 3.2.6) - activesupport (= 3.2.6) - rack-ssl (~> 1.3.2) + 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.2) + sprockets-rails (~> 2.0.0) + rails-i18n (4.0.1) + i18n (~> 0.6) + rails (~> 4.0) + railties (4.0.2) + actionpack (= 4.0.2) + activesupport (= 4.0.2) rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.14.6, < 2.0) - rake (0.9.2.2) - rdoc (3.12) - json (~> 1.4) - redcarpet (2.1.1) - rinku (1.5.1) - ruby-openid (2.2.0) - sanitize (2.0.3) - nokogiri (>= 1.4.4, < 1.6) - sass (3.1.20) - sass-rails (3.2.5) - railties (~> 3.2.0) + thor (>= 0.18.1, < 2.0) + rake (10.1.1) + redcarpet (3.0.0) + rinku (1.7.3) + ruby-openid (2.3.0) + sanitize (2.1.0) + nokogiri (>= 1.4.4) + sass (3.2.13) + sass-rails (4.0.1) + railties (>= 4.0.0, < 5.0) sass (>= 3.1.10) - tilt (~> 1.3) - sprockets (2.1.3) + sprockets-rails (~> 2.0.0) + soap4r-ruby1.9 (2.0.5) + sprockets (2.10.1) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - therubyracer (0.10.1) - libv8 (~> 3.3.10) - thor (0.15.4) - tilt (1.3.3) - timecop (0.3.5) - treetop (1.4.10) + sprockets-rails (2.0.1) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (~> 2.8) + thor (0.18.1) + thread_safe (0.1.3) + atomic + tilt (1.4.1) + timecop (0.7.1) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.33) - uglifier (1.2.6) + tzinfo (0.3.38) + uglifier (2.4.0) execjs (>= 0.3.0) - multi_json (~> 1.3) + json (>= 1.8.0) validates_email_format_of (1.5.3) + vendorer (0.1.14) PLATFORMS ruby DEPENDENCIES SystemTimer (>= 1.1.3) - bigdecimal - browser - coffee-rails (~> 3.2.1) - composite_primary_keys (>= 5.0.8) + actionpack-page_caching + bigdecimal (~> 1.1.0) + coffee-rails (~> 4.0.0) + composite_primary_keys (>= 6.0.1) + dalli (~> 2.6.4) deadlock_retry (>= 1.2.0) dynamic_form htmlentities - http_accept_language (>= 1.0.2) + http_accept_language (~> 2.0.0) httpclient - iconv + iconv (= 0.1) jquery-rails + json + jsonify-rails + kgio libxml-ruby (>= 2.0.5) - memcached (>= 1.4.1) - minitest + minitest (~> 4.7.0) + oauth-plugin (>= 0.5.1) open_id_authentication (>= 1.1.0) - openstreetmap-oauth-plugin (>= 0.4.0.1) - paperclip (~> 2.0) + openstreetmap-i18n-js (>= 3.0.0.rc5.3) + paperclip (~> 3.0) pg - rails (= 3.2.6) - rails-i18n (>= 0.6.3) + psych + r2 + rack-cors + rails (= 4.0.2) + rails-i18n (~> 4.0.0) redcarpet rinku (>= 1.2.2) ruby-openid (>= 2.2.0) sanitize - sass-rails (~> 3.2.3) - therubyracer + sass-rails (~> 4.0.0) + soap4r-ruby1.9 timecop - uglifier (>= 1.0.3) + uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1) + vendorer