X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9326c7e402c88ed4bbfef64b6ad518b67427b674..bd402599f541e3da86036f21d955b6e6fc31185c:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 439862353..c875850f7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,40 +1,48 @@ GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (4.0.2) - actionpack (= 4.0.2) + actionmailer (4.1.1) + actionpack (= 4.1.1) + actionview (= 4.1.1) mail (~> 2.5.4) - actionpack (4.0.2) - activesupport (= 4.0.2) - builder (~> 3.1.0) - erubis (~> 2.7.0) + actionpack (4.1.1) + actionview (= 4.1.1) + activesupport (= 4.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.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) + actionview (4.1.1) + activesupport (= 4.1.1) + builder (~> 3.1) + erubis (~> 2.7.0) + activemodel (4.1.1) + activesupport (= 4.1.1) + builder (~> 3.1) + activerecord (4.1.1) + activemodel (= 4.1.1) + activesupport (= 4.1.1) + arel (~> 5.0.0) + activesupport (4.1.1) + i18n (~> 0.6, >= 0.6.9) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) thread_safe (~> 0.1) - tzinfo (~> 0.3.37) - arel (4.0.1) - atomic (1.1.14) + tzinfo (~> 1.1) + arel (5.0.1.20140414130214) bigdecimal (1.1.0) - builder (3.1.4) + builder (3.2.2) + capybara (2.2.1) + 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) - cocaine (0.5.3) + 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) @@ -42,24 +50,24 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.6.3) - composite_primary_keys (6.0.1) - activerecord (>= 4.0.0) - dalli (2.6.4) + coffee-script-source (1.7.0) + colorize (0.7.3) + composite_primary_keys (7.0.1) + activerecord (~> 4.1.0) + dalli (2.7.2) deadlock_retry (1.2.0) dynamic_form (1.1.4) erubis (2.7.0) - execjs (2.0.2) - faraday (0.8.8) - multipart-post (~> 1.2.0) + execjs (2.1.0) + faraday (0.9.0) + multipart-post (>= 1.2, < 3) hike (1.2.3) htmlentities (4.3.1) - http_accept_language (2.0.0) - httpauth (0.2.0) + http_accept_language (2.0.1) httpclient (2.3.4.1) i18n (0.6.9) iconv (0.1) - jquery-rails (3.0.4) + jquery-rails (3.1.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) @@ -68,104 +76,120 @@ GEM jsonify-rails (0.3.2) actionpack jsonify (< 0.4.0) - jwt (0.1.8) - multi_json (>= 1.5) - kgio (2.8.1) + jwt (1.0.0) + kgio (2.9.2) + konacha (3.2.3) + 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) - mini_portile (0.5.2) - minitest (4.7.5) - multi_json (1.8.2) + mini_portile (0.6.0) + minitest (5.3.4) + multi_json (1.10.1) multi_xml (0.5.5) - multipart-post (1.2.0) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) + multipart-post (2.0.0) + nokogiri (1.6.2.1) + mini_portile (= 0.6.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) - jwt (~> 0.1.4) - multi_json (~> 1.0) + oauth2 (0.9.4) + 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) openstreetmap-i18n-js (3.0.0.rc5.3) i18n - paperclip (3.5.2) + paperclip (4.1.1) activemodel (>= 3.0.0) activesupport (>= 3.0.0) cocaine (~> 0.5.3) mime-types pg (0.17.1) - polyglot (0.3.3) - psych (2.0.2) - r2 (0.2.2) + poltergeist (1.5.0) + capybara (~> 2.1) + cliver (~> 0.3.1) + multi_json (~> 1.0) + websocket-driver (>= 0.2.0) + polyglot (0.3.4) + psych (2.0.5) + r2 (0.2.4) rack (1.5.2) rack-cors (0.2.9) - rack-openid (1.4.1) + rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (0.6.2) rack (>= 1.0) - rails (4.0.2) - actionmailer (= 4.0.2) - actionpack (= 4.0.2) - activerecord (= 4.0.2) - activesupport (= 4.0.2) + rails (4.1.1) + actionmailer (= 4.1.1) + actionpack (= 4.1.1) + actionview (= 4.1.1) + activemodel (= 4.1.1) + activerecord (= 4.1.1) + activesupport (= 4.1.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.2) - sprockets-rails (~> 2.0.0) - rails-i18n (4.0.1) + railties (= 4.1.1) + sprockets-rails (~> 2.0) + rails-i18n (4.0.2) i18n (~> 0.6) - rails (~> 4.0) - railties (4.0.2) - actionpack (= 4.0.2) - activesupport (= 4.0.2) + rails (>= 4.0) + railties (4.1.1) + actionpack (= 4.1.1) + activesupport (= 4.1.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.1.0) - redcarpet (3.0.0) + rake (10.3.2) + redcarpet (3.1.2) rinku (1.7.3) - ruby-openid (2.3.0) - sanitize (2.0.6) + ruby-openid (2.5.0) + sanitize (2.1.0) nokogiri (>= 1.4.4) - sass (3.2.12) - sass-rails (4.0.1) + sass (3.2.19) + sass-rails (4.0.3) railties (>= 4.0.0, < 5.0) - sass (>= 3.1.10) - sprockets-rails (~> 2.0.0) - sprockets (2.10.1) + sass (~> 3.2.0) + sprockets (~> 2.8, <= 2.11.0) + sprockets-rails (~> 2.0) + soap4r-ruby1.9 (2.0.5) + sprockets (2.11.0) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.1) + sprockets-rails (2.1.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) - thor (0.18.1) - thread_safe (0.1.3) - atomic + thor (0.19.1) + thread_safe (0.3.4) tilt (1.4.1) - timecop (0.7.0) + timecop (0.7.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.38) - uglifier (2.3.3) + tzinfo (1.2.0) + thread_safe (~> 0.1) + uglifier (2.5.0) execjs (>= 0.3.0) json (>= 1.8.0) validates_email_format_of (1.5.3) - vendorer (0.1.14) + vendorer (0.1.16) + websocket-driver (0.3.3) + xpath (2.0.0) + nokogiri (~> 1.3) PLATFORMS ruby @@ -175,7 +199,7 @@ DEPENDENCIES actionpack-page_caching bigdecimal (~> 1.1.0) coffee-rails (~> 4.0.0) - composite_primary_keys (>= 6.0.1) + composite_primary_keys (~> 7.0.1) dalli deadlock_retry (>= 1.2.0) dynamic_form @@ -187,23 +211,26 @@ DEPENDENCIES json jsonify-rails kgio + konacha libxml-ruby (>= 2.0.5) - minitest (~> 4.7.0) + minitest (~> 5.1) oauth-plugin (>= 0.5.1) open_id_authentication (>= 1.1.0) openstreetmap-i18n-js (>= 3.0.0.rc5.3) - paperclip (~> 3.0) + paperclip (~> 4.0) pg + poltergeist psych r2 rack-cors - rails (= 4.0.2) + rails (= 4.1.1) rails-i18n (~> 4.0.0) redcarpet rinku (>= 1.2.2) ruby-openid (>= 2.2.0) sanitize - sass-rails (~> 4.0.0) + sass-rails (~> 4.0.3) + soap4r-ruby1.9 timecop uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1)