X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/62e571a4aaa7324fe56c6c58a0dca5f943e7f9ee..3e9080ac5750b893149b110679179eabaa37f7f7:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 7bd2eeeb2..3f6685175 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,126 +1,241 @@ GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - abstract (1.0.0) - actionmailer (3.0.10) - actionpack (= 3.0.10) - mail (~> 2.2.19) - actionpack (3.0.10) - activemodel (= 3.0.10) - activesupport (= 3.0.10) - builder (~> 2.1.2) - erubis (~> 2.6.6) - i18n (~> 0.5.0) - rack (~> 1.2.1) - rack-mount (~> 0.6.14) - rack-test (~> 0.5.7) - tzinfo (~> 0.3.23) - activemodel (3.0.10) - activesupport (= 3.0.10) - builder (~> 2.1.2) - i18n (~> 0.5.0) - activerecord (3.0.10) - activemodel (= 3.0.10) - activesupport (= 3.0.10) - arel (~> 2.0.10) - tzinfo (~> 0.3.23) - activeresource (3.0.10) - activemodel (= 3.0.10) - activesupport (= 3.0.10) - activesupport (3.0.10) - addressable (2.2.6) - arel (2.0.10) - builder (2.1.2) - composite_primary_keys (3.1.10) - activerecord (>= 3.0.5, ~> 3.0.0) - erubis (2.6.6) - abstract (>= 1.0.0) - faraday (0.7.4) - addressable (~> 2.2.6) - multipart-post (~> 1.1.0) - rack (< 2, >= 1.1.0) - httpclient (2.2.1) - i18n (0.5.0) - libxml-ruby (2.2.2) - mail (2.2.19) - activesupport (>= 2.3.6) - i18n (>= 0.4.0) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.16) - multi_json (1.0.3) - multipart-post (1.1.3) - nokogiri (1.5.0) - oauth (0.4.5) - oauth-plugin (0.4.0.pre7) + actionmailer (4.1.7) + actionpack (= 4.1.7) + actionview (= 4.1.7) + mail (~> 2.5, >= 2.5.4) + actionpack (4.1.7) + actionview (= 4.1.7) + activesupport (= 4.1.7) + rack (~> 1.5.2) + rack-test (~> 0.6.2) + actionpack-page_caching (1.0.2) + actionpack (>= 4.0.0, < 5) + actionview (4.1.7) + activesupport (= 4.1.7) + builder (~> 3.1) + erubis (~> 2.7.0) + activemodel (4.1.7) + activesupport (= 4.1.7) + builder (~> 3.1) + activerecord (4.1.7) + activemodel (= 4.1.7) + activesupport (= 4.1.7) + arel (~> 5.0.0) + activesupport (4.1.7) + 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.2.20141016) + execjs + bigdecimal (1.1.0) + builder (3.2.2) + capybara (2.4.4) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + climate_control (0.0.3) + activesupport (>= 3.0) + cliver (0.3.2) + cocaine (0.5.4) + climate_control (>= 0.0.3, < 1.0) + coffee-rails (4.0.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.0) + coffee-script (2.3.0) + coffee-script-source + execjs + coffee-script-source (1.8.0) + colorize (0.7.3) + composite_primary_keys (7.0.12) + activerecord (~> 4.1.7) + crass (0.2.1) + dalli (2.7.2) + deadlock_retry (1.2.0) + dynamic_form (1.1.4) + erubis (2.7.0) + execjs (2.2.2) + faraday (0.9.0) + multipart-post (>= 1.2, < 3) + hike (1.2.3) + htmlentities (4.3.2) + http_accept_language (2.0.2) + httpclient (2.5.3.2) + i18n (0.6.11) + iconv (0.1) + jquery-rails (3.1.2) + 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 (1.0.0) + kgio (2.9.2) + konacha (3.3.0) + actionpack (>= 3.1, < 5) + capybara + colorize + railties (>= 3.1, < 5) + sprockets + libxml-ruby (2.7.0) + mail (2.6.3) + mime-types (>= 1.16, < 3) + mime-types (2.4.3) + mini_portile (0.6.1) + minitest (5.4.2) + multi_json (1.10.1) + multi_xml (0.5.5) + multipart-post (2.0.0) + nokogiri (1.6.4.1) + mini_portile (~> 0.6.0) + nokogumbo (1.1.12) + nokogiri + oauth (0.4.7) + oauth-plugin (0.5.1) multi_json oauth (~> 0.4.4) - oauth2 + oauth2 (>= 0.5.0) rack - oauth2 (0.5.0) - faraday (< 0.8, >= 0.6.1) - multi_json (~> 1.0.0) - open_id_authentication (1.1.0) + oauth2 (1.0.0) + faraday (>= 0.8, < 0.10) + jwt (~> 1.0) + 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.2) - rack (1.2.3) - rack-mount (0.6.14) - rack (>= 1.0.0) - rack-openid (1.3.1) + openstreetmap-i18n-js (3.0.0.rc5.3) + i18n + paperclip (4.2.0) + activemodel (>= 3.0.0) + activesupport (>= 3.0.0) + cocaine (~> 0.5.3) + mime-types + pg (0.17.1) + poltergeist (1.5.1) + capybara (~> 2.1) + cliver (~> 0.3.1) + multi_json (~> 1.0) + websocket-driver (>= 0.2.0) + psych (2.0.6) + r2 (0.2.5) + rack (1.5.2) + rack-cors (0.2.9) + rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-test (0.5.7) + rack-test (0.6.2) rack (>= 1.0) - rails (3.0.10) - actionmailer (= 3.0.10) - actionpack (= 3.0.10) - activerecord (= 3.0.10) - activeresource (= 3.0.10) - activesupport (= 3.0.10) - bundler (~> 1.0) - railties (= 3.0.10) - rails-i18n-updater (1.0.1) - actionpack - activesupport - rails - railties (3.0.10) - actionpack (= 3.0.10) - activesupport (= 3.0.10) + rails (4.1.7) + actionmailer (= 4.1.7) + actionpack (= 4.1.7) + actionview (= 4.1.7) + activemodel (= 4.1.7) + activerecord (= 4.1.7) + activesupport (= 4.1.7) + bundler (>= 1.3.0, < 2.0) + railties (= 4.1.7) + sprockets-rails (~> 2.0) + rails-i18n (4.0.3) + i18n (~> 0.6) + railties (~> 4.0) + railties (4.1.7) + actionpack (= 4.1.7) + activesupport (= 4.1.7) rake (>= 0.8.7) - rdoc (~> 3.4) - thor (~> 0.14.4) - rake (0.9.2) - rdoc (3.9.4) - rmagick (2.13.1) - ruby-openid (2.1.8) - sanitize (2.0.3) - nokogiri (>= 1.4.4, < 1.6) - thor (0.14.6) - timecop (0.3.5) - treetop (1.4.10) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.29) - validates_email_format_of (1.5.1) + thor (>= 0.18.1, < 2.0) + rake (10.3.2) + redcarpet (3.2.0) + rinku (1.7.3) + ruby-openid (2.6.0) + sanitize (3.0.3) + crass (~> 0.2.0) + nokogiri (>= 1.4.4) + nokogumbo (= 1.1.12) + sass (3.2.19) + sass-rails (4.0.4) + railties (>= 4.0.0, < 5.0) + sass (~> 3.2.2) + sprockets (~> 2.8, < 2.12) + sprockets-rails (~> 2.0) + soap4r-ruby1.9 (2.0.5) + sprockets (2.11.3) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + sprockets-rails (2.2.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (>= 2.8, < 4.0) + thor (0.19.1) + thread_safe (0.3.4) + tilt (1.4.1) + timecop (0.7.1) + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (2.5.3) + execjs (>= 0.3.0) + json (>= 1.8.0) + validates_email_format_of (1.6.1) + i18n + vendorer (0.1.16) + websocket-driver (0.4.0) + xpath (2.0.0) + nokogiri (~> 1.3) PLATFORMS ruby DEPENDENCIES SystemTimer (>= 1.1.3) - arel (>= 2.0.9) - composite_primary_keys (= 3.1.10) + actionpack-page_caching + autoprefixer-rails + bigdecimal (~> 1.1.0) + coffee-rails (~> 4.0.0) + composite_primary_keys (~> 7.0.11) + 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 + konacha libxml-ruby (>= 2.0.5) - oauth (>= 0.4.4) - oauth-plugin (>= 0.4.0.pre4) + minitest (~> 5.1) + oauth-plugin (>= 0.5.1) open_id_authentication (>= 1.1.0) + openstreetmap-i18n-js (>= 3.0.0.rc5.3) + paperclip (~> 4.0) pg - rails (= 3.0.10) - rails-i18n-updater - rmagick + poltergeist + psych + r2 + rack-cors + rails (= 4.1.7) + rails-i18n (~> 4.0.0) + redcarpet + rinku (>= 1.2.2) + ruby-openid (>= 2.2.0) sanitize + sass-rails (~> 4.0.3) + soap4r-ruby1.9 timecop + uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1) + vendorer