X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1154be55fa8ed7088213fb23b276182745f1b4f1..28b886362755cb6750b62222cecf87bd9b2efbbe:/Gemfile.lock?ds=sidebyside diff --git a/Gemfile.lock b/Gemfile.lock index 7f82e5532..130b57b5b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,172 +2,209 @@ GEM remote: http://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (3.1.1) - actionpack (= 3.1.1) - mail (~> 2.3.0) - actionpack (3.1.1) - activemodel (= 3.1.1) - activesupport (= 3.1.1) - builder (~> 3.0.0) + actionmailer (4.0.3) + actionpack (= 4.0.3) + mail (~> 2.5.4) + actionpack (4.0.3) + activesupport (= 4.0.3) + builder (~> 3.1.0) erubis (~> 2.7.0) - i18n (~> 0.6) - rack (~> 1.3.2) - rack-cache (~> 1.1) - rack-mount (~> 0.8.2) - rack-test (~> 0.6.1) - sprockets (~> 2.0.2) - activemodel (3.1.1) - activesupport (= 3.1.1) - builder (~> 3.0.0) - i18n (~> 0.6) - activerecord (3.1.1) - activemodel (= 3.1.1) - activesupport (= 3.1.1) - arel (~> 2.2.1) - tzinfo (~> 0.3.29) - activeresource (3.1.1) - activemodel (= 3.1.1) - activesupport (= 3.1.1) - activesupport (3.1.1) - multi_json (~> 1.0) - addressable (2.2.6) - arel (2.2.1) - builder (3.0.0) - coffee-rails (3.1.1) + rack (~> 1.5.2) + rack-test (~> 0.6.2) + actionpack-page_caching (1.0.2) + actionpack (>= 4.0.0, < 5) + activemodel (4.0.3) + activesupport (= 4.0.3) + builder (~> 3.1.0) + activerecord (4.0.3) + activemodel (= 4.0.3) + activerecord-deprecated_finders (~> 1.0.2) + activesupport (= 4.0.3) + arel (~> 4.0.0) + activerecord-deprecated_finders (1.0.3) + activesupport (4.0.3) + i18n (~> 0.6, >= 0.6.4) + minitest (~> 4.2) + multi_json (~> 1.3) + thread_safe (~> 0.1) + tzinfo (~> 0.3.37) + arel (4.0.2) + atomic (1.1.14) + bigdecimal (1.1.0) + 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.1.0) + railties (>= 4.0.0, < 5.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.1.3) - composite_primary_keys (4.1.1) - activerecord (~> 3.1) + coffee-script-source (1.7.0) + composite_primary_keys (6.0.1) + activerecord (>= 4.0.0) + dalli (2.7.0) + deadlock_retry (1.2.0) dynamic_form (1.1.4) erubis (2.7.0) - execjs (1.2.9) + execjs (2.0.2) + faraday (0.9.0) + multipart-post (>= 1.2, < 3) + hike (1.2.3) + htmlentities (4.3.1) + http_accept_language (2.0.1) + httpclient (2.3.4.1) + i18n (0.6.9) + iconv (0.1) + jquery-rails (3.1.0) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.8.1) + jsonify (0.3.1) multi_json (~> 1.0) - faraday (0.7.5) - addressable (~> 2.2.6) - multipart-post (~> 1.1.3) - rack (< 2, >= 1.1.0) - hike (1.2.1) - httpclient (2.2.3) - i18n (0.6.0) - json (1.6.1) - libv8 (3.3.10.2) - libxml-ruby (2.2.2) - mail (2.3.0) - i18n (>= 0.4.0) + jsonify-rails (0.3.2) + actionpack + jsonify (< 0.4.0) + jwt (0.1.11) + multi_json (>= 1.5) + kgio (2.9.2) + libxml-ruby (2.7.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - memcache-client (1.8.5) - memcached (1.3.5) - mime-types (1.17.2) - multi_json (1.0.3) - multipart-post (1.1.3) - nokogiri (1.5.0) - oauth (0.4.5) - oauth-plugin (0.4.0.rc2) + 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 + oauth2 (>= 0.5.0) rack - oauth2 (0.5.1) - faraday (~> 0.7.4) - multi_json (~> 1.0.3) - open_id_authentication (1.1.0) + 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) - pg (0.11.0) - polyglot (0.3.3) - prototype-rails (3.1.0) - rails (~> 3.1) - rack (1.3.5) - rack-cache (1.1) - rack (>= 0.4) - rack-mount (0.8.3) - rack (>= 1.0.0) - rack-openid (1.3.1) + openstreetmap-i18n-js (3.0.0.rc5.3) + i18n + paperclip (4.1.0) + activemodel (>= 3.0.0) + activesupport (>= 3.0.0) + cocaine (~> 0.5.3) + mime-types + pg (0.17.1) + polyglot (0.3.4) + psych (2.0.4) + r2 (0.2.2) + rack (1.5.2) + rack-cors (0.2.9) + rack-openid (1.4.2) 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.1.1) - actionmailer (= 3.1.1) - actionpack (= 3.1.1) - activerecord (= 3.1.1) - activeresource (= 3.1.1) - activesupport (= 3.1.1) - bundler (~> 1.0) - railties (= 3.1.1) - rails-i18n-updater (1.0.1) - actionpack - activesupport - rails - railties (3.1.1) - actionpack (= 3.1.1) - activesupport (= 3.1.1) - rack-ssl (~> 1.3.2) + rails (4.0.3) + actionmailer (= 4.0.3) + actionpack (= 4.0.3) + activerecord (= 4.0.3) + activesupport (= 4.0.3) + bundler (>= 1.3.0, < 2.0) + railties (= 4.0.3) + sprockets-rails (~> 2.0.0) + rails-i18n (4.0.1) + i18n (~> 0.6) + rails (~> 4.0) + railties (4.0.3) + actionpack (= 4.0.3) + activesupport (= 4.0.3) rake (>= 0.8.7) - rdoc (~> 3.4) - thor (~> 0.14.6) - rake (0.9.2.2) - rdoc (3.11) - json (~> 1.4) - rinku (1.4.1) - rmagick (2.13.1) - ruby-openid (2.1.8) - sanitize (2.0.3) - nokogiri (< 1.6, >= 1.4.4) - sass (3.1.10) - sass-rails (3.1.4) - actionpack (~> 3.1.0) - railties (~> 3.1.0) - sass (>= 3.1.4) - sprockets (~> 2.0.0) - tilt (~> 1.3.2) - sprockets (2.0.3) + thor (>= 0.18.1, < 2.0) + rake (10.1.1) + redcarpet (3.1.1) + rinku (1.7.3) + ruby-openid (2.5.0) + sanitize (2.1.0) + nokogiri (>= 1.4.4) + sass (3.2.14) + sass-rails (4.0.1) + railties (>= 4.0.0, < 5.0) + sass (>= 3.1.10) + 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.3.0, ~> 1.1) - therubyracer (0.9.9) - libv8 (~> 3.3.10) - thor (0.14.6) - tilt (1.3.3) - timecop (0.3.5) - treetop (1.4.10) + tilt (~> 1.1, != 1.3.0) + 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.31) - uglifier (1.0.4) + tzinfo (0.3.38) + uglifier (2.4.0) execjs (>= 0.3.0) - multi_json (>= 1.0.2) + json (>= 1.8.0) validates_email_format_of (1.5.3) + vendorer (0.1.14) PLATFORMS ruby DEPENDENCIES SystemTimer (>= 1.1.3) - coffee-rails (~> 3.1.0) - composite_primary_keys (>= 4.1.1) + actionpack-page_caching + bigdecimal (~> 1.1.0) + coffee-rails (~> 4.0.0) + composite_primary_keys (>= 6.0.1) + dalli + deadlock_retry (>= 1.2.0) dynamic_form + htmlentities + http_accept_language (~> 2.0.0) httpclient + iconv (= 0.1) + jquery-rails + json + jsonify-rails + kgio libxml-ruby (>= 2.0.5) - memcache-client - memcached - oauth-plugin (>= 0.4.0.pre7) + minitest (~> 4.7.0) + oauth-plugin (>= 0.5.1) open_id_authentication (>= 1.1.0) + openstreetmap-i18n-js (>= 3.0.0.rc5.3) + paperclip (~> 4.0) pg - prototype-rails - rails (= 3.1.1) - rails-i18n-updater + psych + r2 + rack-cors + rails (= 4.0.3) + rails-i18n (~> 4.0.0) + redcarpet rinku (>= 1.2.2) - rmagick + ruby-openid (>= 2.2.0) sanitize - sass-rails (~> 3.1.0) - therubyracer + sass-rails (~> 4.0.0) + soap4r-ruby1.9 timecop - uglifier + uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1) + vendorer