X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b095b59d5e0ee805e49980af80b21bd1acff1345..3f3ffdfea1ecb57fb95e24b71ed070c8f9fbedbd:/Gemfile.lock?ds=inline diff --git a/Gemfile.lock b/Gemfile.lock index d477fcfca..03b033199 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,190 +1,329 @@ GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - 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) - rack (~> 1.5.2) + actionmailer (4.2.8) + actionpack (= 4.2.8) + actionview (= 4.2.8) + activejob (= 4.2.8) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.8) + actionview (= 4.2.8) + activesupport (= 4.2.8) + rack (~> 1.6) 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.15) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionpack-page_caching (1.1.0) + actionpack (>= 4.0.0, < 6) + actionview (4.2.8) + activesupport (= 4.2.8) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (4.2.8) + activesupport (= 4.2.8) + globalid (>= 0.3.0) + activemodel (4.2.8) + activesupport (= 4.2.8) + builder (~> 3.1) + activerecord (4.2.8) + activemodel (= 4.2.8) + activesupport (= 4.2.8) + arel (~> 6.0) + activesupport (4.2.8) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) + arel (6.0.4) + ast (2.3.0) + autoprefixer-rails (6.7.7.1) + execjs bigdecimal (1.1.0) - builder (3.1.4) - capybara (2.2.1) + builder (3.2.3) + canonical-rails (0.1.2) + rails (>= 4.1, < 5.1) + capybara (2.13.0) + addressable 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) + climate_control (0.1.0) cliver (0.3.2) - cocaine (0.5.3) + cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) - coffee-rails (4.0.1) + coffee-rails (4.1.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) - coffee-script (2.2.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.7.0) - colorize (0.6.0) - composite_primary_keys (6.0.1) - activerecord (>= 4.0.0) - dalli (2.7.0) + coffee-script-source (1.12.2) + colorize (0.8.1) + composite_primary_keys (8.1.4) + activerecord (~> 4.2.0) + concurrent-ruby (1.0.5) + coveralls (0.8.19) + json (>= 1.8, < 3) + simplecov (~> 0.12.0) + term-ansicolor (~> 1.3) + thor (~> 0.19.1) + tins (~> 1.6) + crack (0.4.3) + safe_yaml (~> 1.0.0) + crass (1.0.2) + dalli (2.7.6) deadlock_retry (1.2.0) + docile (1.1.5) dynamic_form (1.1.4) erubis (2.7.0) - execjs (2.0.2) - faraday (0.9.0) + execjs (2.7.0) + exifr (1.2.5) + factory_girl (4.8.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.8.0) + factory_girl (~> 4.8.0) + railties (>= 3.0.0) + faraday (0.11.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) + fspath (3.1.0) + geoip (1.6.3) + globalid (0.3.7) + activesupport (>= 4.1.0) + hashdiff (0.3.2) + hashie (3.5.5) + htmlentities (4.3.4) + http_accept_language (2.0.5) + i18n (0.8.1) + i18n-js (3.0.0.rc16) + i18n (~> 0.6, >= 0.6.6) + image_optim (0.24.2) + exifr (~> 1.2, >= 1.2.2) + fspath (~> 3.0) + image_size (~> 1.5) + in_threads (~> 1.3) + progress (~> 3.0, >= 3.0.1) + image_optim_rails (0.3.0) + image_optim (~> 0.24.0) + rails + sprockets + image_size (1.5.0) + in_threads (1.4.0) + jquery-rails (4.3.1) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.1) + jshint (1.5.0) + execjs (>= 1.4.0) + multi_json (~> 1.0) + therubyracer (~> 0.12.1) + json (2.0.3) 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.9.2) - konacha (3.1.0) - actionpack (>= 3.1, < 5) + jwt (1.5.6) + kgio (2.11.0) + konacha (4.0.0) + actionpack (>= 4.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.4) - multi_xml (0.5.5) + railties (>= 4.1, < 5) + sprockets (>= 2, < 4) + sprockets-rails (>= 2, < 4) + tilt + libv8 (3.16.14.19) + libxml-ruby (3.0.0) + logstash-event (1.2.02) + logstasher (1.2.1) + activesupport (>= 4.0) + logstash-event (~> 1.2.0) + request_store + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.4) + mime-types (>= 1.16, < 4) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mimemagic (0.3.0) + mini_portile2 (2.1.0) + minitest (5.10.1) + multi_json (1.12.1) + multi_xml (0.6.0) multipart-post (2.0.0) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) + nokogiri (1.7.1) + mini_portile2 (~> 2.1.0) + nokogumbo (1.4.9) + nokogiri oauth (0.4.7) oauth-plugin (0.5.1) multi_json oauth (~> 0.4.4) oauth2 (>= 0.5.0) rack - oauth2 (0.9.3) - faraday (>= 0.8, < 0.10) - jwt (~> 0.1.8) + oauth2 (1.3.0) + faraday (>= 0.8, < 0.11) + 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 (4.1.1) - activemodel (>= 3.0.0) - activesupport (>= 3.0.0) - cocaine (~> 0.5.3) + rack (>= 1.2, < 3) + omniauth (1.6.1) + hashie (>= 3.4.6, < 3.6.0) + rack (>= 1.6.2, < 3) + omniauth-facebook (4.0.0) + omniauth-oauth2 (~> 1.2) + omniauth-github (1.2.3) + omniauth (~> 1.5) + omniauth-oauth2 (>= 1.4.0, < 2.0) + omniauth-google-oauth2 (0.4.1) + jwt (~> 1.5.2) + multi_json (~> 1.3) + omniauth (>= 1.1.1) + omniauth-oauth2 (>= 1.3.1) + omniauth-mediawiki (0.0.3) + jwt (~> 1.0) + omniauth-oauth (~> 1.0) + omniauth-oauth (1.1.0) + oauth + omniauth (~> 1.0) + omniauth-oauth2 (1.4.0) + oauth2 (~> 1.0) + omniauth (~> 1.2) + omniauth-openid (1.0.1) + omniauth (~> 1.0) + rack-openid (~> 1.3.1) + omniauth-windowslive (0.0.12) + multi_json (~> 1.12) + omniauth-oauth2 (~> 1.4) + paperclip (4.3.7) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + cocaine (~> 0.5.5) mime-types - pg (0.17.1) - poltergeist (1.5.0) + mimemagic (= 0.3.0) + parser (2.4.0.0) + ast (~> 2.2) + pg (0.20.0) + poltergeist (1.14.0) capybara (~> 2.1) cliver (~> 0.3.1) - multi_json (~> 1.0) websocket-driver (>= 0.2.0) - 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) + powerpack (0.1.1) + progress (3.3.1) + psych (2.2.4) + public_suffix (2.0.5) + r2 (0.2.6) + rack (1.6.5) + rack-cors (0.4.1) + rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) - rails (4.0.3) - actionmailer (= 4.0.3) - actionpack (= 4.0.3) - activerecord (= 4.0.3) - activesupport (= 4.0.3) + rack-uri_sanitizer (0.0.2) + rails (4.2.8) + actionmailer (= 4.2.8) + actionpack (= 4.2.8) + actionview (= 4.2.8) + activejob (= 4.2.8) + activemodel (= 4.2.8) + activerecord (= 4.2.8) + activesupport (= 4.2.8) 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) + railties (= 4.2.8) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.8) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + rails-i18n (4.0.9) + i18n (~> 0.7) + railties (~> 4.0) + railties (4.2.8) + actionpack (= 4.2.8) + activesupport (= 4.2.8) rake (>= 0.8.7) 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) + rainbow (2.2.1) + rake (12.0.0) + redcarpet (3.4.0) + ref (2.0.0) + request_store (1.3.2) + rinku (2.0.2) + rotp (3.3.0) + rubocop (0.47.1) + parser (>= 2.3.3.1, < 3.0) + powerpack (~> 0.1) + rainbow (>= 1.99.1, < 3.0) + ruby-progressbar (~> 1.7) + unicode-display_width (~> 1.0, >= 1.0.1) + ruby-openid (2.7.0) + ruby-progressbar (1.8.1) + safe_yaml (1.0.4) + sanitize (4.4.0) + crass (~> 1.0.2) 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.11.0) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - 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.2.0) - atomic (>= 1.1.7, < 2) - tilt (1.4.1) - timecop (0.7.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.38) - uglifier (2.4.0) - execjs (>= 0.3.0) - json (>= 1.8.0) - validates_email_format_of (1.5.3) - vendorer (0.1.14) - websocket-driver (0.3.2) + nokogumbo (~> 1.4.1) + sass (3.4.23) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + secure_headers (3.6.2) + useragent + simplecov (0.12.0) + docile (~> 1.1.0) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + term-ansicolor (1.4.0) + tins (~> 1.0) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) + ref + thor (0.19.4) + thread_safe (0.3.6) + tilt (2.0.7) + timecop (0.8.1) + tins (1.13.2) + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (3.1.9) + execjs (>= 0.3.0, < 3) + unicode-display_width (1.1.3) + useragent (0.16.8) + validates_email_format_of (1.6.3) + i18n + vendorer (0.1.16) + webmock (2.3.2) + addressable (>= 2.3.6) + crack (>= 0.3.2) + hashdiff + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) xpath (2.0.0) nokogiri (~> 1.3) @@ -194,41 +333,60 @@ PLATFORMS DEPENDENCIES SystemTimer (>= 1.1.3) actionpack-page_caching + autoprefixer-rails bigdecimal (~> 1.1.0) - coffee-rails (~> 4.0.0) - composite_primary_keys (>= 6.0.1) + canonical-rails + coffee-rails (~> 4.1.0) + composite_primary_keys (~> 8.1.0) + coveralls dalli deadlock_retry (>= 1.2.0) dynamic_form + factory_girl_rails + faraday + geoip htmlentities http_accept_language (~> 2.0.0) - httpclient - iconv (= 0.1) + i18n-js (>= 3.0.0.rc10) + image_optim_rails jquery-rails + jshint json jsonify-rails kgio konacha libxml-ruby (>= 2.0.5) - minitest (~> 4.7.0) + logstasher + minitest (~> 5.1) oauth-plugin (>= 0.5.1) - open_id_authentication (>= 1.1.0) - openstreetmap-i18n-js (>= 3.0.0.rc5.3) + omniauth + omniauth-facebook + omniauth-github + omniauth-google-oauth2 (>= 0.2.7) + omniauth-mediawiki (>= 0.0.3) + omniauth-openid + omniauth-windowslive paperclip (~> 4.0) pg poltergeist psych r2 rack-cors - rails (= 4.0.3) + rack-uri_sanitizer + rails (= 4.2.8) rails-i18n (~> 4.0.0) redcarpet rinku (>= 1.2.2) - ruby-openid (>= 2.2.0) + rotp + rubocop sanitize - sass-rails (~> 4.0.0) - soap4r-ruby1.9 + sass-rails (~> 5.0) + secure_headers timecop uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1) vendorer + webmock + +BUNDLED WITH + 1.12.5