X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/52d7cae438d4b6f57423a3e22e4a5aa922a47336..22af018298047ece6a01daaa8ffc0b29f1bcaaed:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index aa53ba8ba..76a31e169 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,138 +2,191 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (4.2.1) - actionpack (= 4.2.1) - actionview (= 4.2.1) - activejob (= 4.2.1) + aasm (5.0.1) + concurrent-ruby (~> 1.0) + actioncable (5.2.0) + actionpack (= 5.2.0) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.1) - actionview (= 4.2.1) - activesupport (= 4.2.1) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - actionpack-page_caching (1.0.2) - actionpack (>= 4.0.0, < 5) - actionview (4.2.1) - activesupport (= 4.2.1) + rails-dom-testing (~> 2.0) + actionpack (5.2.0) + actionview (= 5.2.0) + activesupport (= 5.2.0) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionpack-page_caching (1.1.0) + actionpack (>= 4.0.0, < 6) + actionview (5.2.0) + activesupport (= 5.2.0) builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - activejob (4.2.1) - activesupport (= 4.2.1) - globalid (>= 0.3.0) - activemodel (4.2.1) - activesupport (= 4.2.1) - builder (~> 3.1) - activerecord (4.2.1) - activemodel (= 4.2.1) - activesupport (= 4.2.1) - arel (~> 6.0) - activesupport (4.2.1) - i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.0) + activesupport (= 5.2.0) + globalid (>= 0.3.6) + activemodel (5.2.0) + activesupport (= 5.2.0) + activerecord (5.2.0) + activemodel (= 5.2.0) + activesupport (= 5.2.0) + arel (>= 9.0) + activestorage (5.2.0) + actionpack (= 5.2.0) + activerecord (= 5.2.0) + marcel (~> 0.3.1) + activesupport (5.2.0) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - arel (6.0.0) - ast (2.0.0) - astrolabe (1.3.0) - parser (>= 2.2.0.pre.3, < 3.0) - autoprefixer-rails (5.1.9) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + annotate (2.7.4) + activerecord (>= 3.2, < 6.0) + rake (>= 10.4, < 13.0) + arel (9.0.0) + ast (2.4.0) + autoprefixer-rails (8.6.5) execjs - json + better_errors (2.5.0) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) bigdecimal (1.1.0) - builder (3.2.2) - capybara (2.4.4) - mime-types (>= 1.16) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + bootsnap (1.3.2) + msgpack (~> 1.0) + builder (3.2.3) + canonical-rails (0.2.4) + rails (>= 4.1, < 5.3) + capybara (2.18.0) + addressable + mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - xpath (~> 2.0) - climate_control (0.0.3) - activesupport (>= 3.0) + xpath (>= 2.0, < 4.0) + climate_control (0.2.0) cliver (0.3.2) - cocaine (0.5.7) - climate_control (>= 0.0.3, < 1.0) - coffee-rails (4.1.0) + coderay (1.1.2) + coffee-rails (4.2.2) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) + railties (>= 4.0.0) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1.1) - colorize (0.7.5) - composite_primary_keys (8.1.0) - activerecord (~> 4.2.0) - coveralls (0.8.0) - multi_json (~> 1.10) - rest-client (>= 1.6.8, < 2) - simplecov (~> 0.9.1) + coffee-script-source (1.12.2) + composite_primary_keys (11.0.3) + activerecord (~> 5.2.0) + concurrent-ruby (1.0.5) + coveralls (0.8.22) + json (>= 1.8, < 3) + simplecov (~> 0.16.1) term-ansicolor (~> 1.3) - thor (~> 0.19.1) - crass (1.0.1) - dalli (2.7.4) - deadlock_retry (1.2.0) - docile (1.1.5) - domain_name (0.5.23) - unf (>= 0.0.5, < 1.0.0) + thor (~> 0.19.4) + tins (~> 1.6) + crack (0.4.3) + safe_yaml (~> 1.0.0) + crass (1.0.4) + dalli (2.7.8) + debug_inspector (0.0.3) + docile (1.3.1) dynamic_form (1.1.4) - erubis (2.7.0) - execjs (2.5.2) - faraday (0.9.1) + erubi (1.7.1) + execjs (2.7.0) + exifr (1.3.4) + factory_bot (4.11.1) + activesupport (>= 3.0.0) + factory_bot_rails (4.11.1) + factory_bot (~> 4.11.1) + railties (>= 3.0.0) + faraday (0.12.2) multipart-post (>= 1.2, < 3) - globalid (0.3.5) - activesupport (>= 4.1.0) - hashie (3.4.1) - hike (1.2.3) - htmlentities (4.3.3) - http-cookie (1.0.2) - domain_name (~> 0.5) + ffi (1.9.25) + fspath (3.1.0) + geoip (1.6.4) + globalid (0.4.1) + activesupport (>= 4.2.0) + hashdiff (0.3.7) + hashie (3.5.7) + htmlentities (4.3.4) http_accept_language (2.0.5) - httpclient (2.6.0.1) - i18n (0.7.0) - jquery-rails (4.0.3) - rails-dom-testing (~> 1.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + i18n-js (3.0.11) + i18n (>= 0.6.6, < 2) + image_optim (0.26.2) + exifr (~> 1.2, >= 1.2.2) + fspath (~> 3.0) + image_size (>= 1.5, < 3) + in_threads (~> 1.3) + progress (~> 3.0, >= 3.0.1) + image_optim_rails (0.4.1) + image_optim (~> 0.24) + rails + sprockets + image_size (2.0.0) + in_threads (1.5.0) + jaro_winkler (1.5.1) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jshint (1.3.1) + jshint (1.5.0) execjs (>= 1.4.0) multi_json (~> 1.0) therubyracer (~> 0.12.1) - json (1.8.2) + json (2.1.0) jsonify (0.3.1) multi_json (~> 1.0) jsonify-rails (0.3.2) actionpack jsonify (< 0.4.0) - jwt (1.4.1) - kgio (2.9.3) - konacha (3.3.0) - actionpack (>= 3.1, < 5) - capybara - colorize - railties (>= 3.1, < 5) - sprockets - libv8 (3.16.14.7) - libxml-ruby (2.8.0) - loofah (2.0.1) + jwt (1.5.6) + kgio (2.11.2) + libv8 (3.16.14.19) + libxml-ruby (3.1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + logstash-event (1.2.02) + logstasher (1.2.2) + activesupport (>= 4.0) + logstash-event (~> 1.2.0) + request_store + loofah (2.2.2) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) - mime-types (2.4.3) - mini_portile (0.6.2) - minitest (5.6.0) - multi_json (1.11.0) - multi_xml (0.5.5) + mail (2.7.0) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.0) + mime-types (3.2.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2018.0812) + mimemagic (0.3.2) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + msgpack (1.2.4) + multi_json (1.13.1) + multi_xml (0.6.0) multipart-post (2.0.0) - netrc (0.10.3) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) - nokogumbo (1.2.0) + nio4r (2.3.1) + nokogiri (1.8.4) + mini_portile2 (~> 2.3.0) + nokogumbo (1.5.0) nokogiri oauth (0.4.7) oauth-plugin (0.5.1) @@ -141,186 +194,255 @@ GEM oauth (~> 0.4.4) oauth2 (>= 0.5.0) rack - oauth2 (1.0.0) - faraday (>= 0.8, < 0.10) + oauth2 (1.4.0) + faraday (>= 0.8, < 0.13) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (~> 1.2) - omniauth (1.2.2) - hashie (>= 1.2, < 4) - rack (~> 1.0) + rack (>= 1.2, < 3) + omniauth (1.8.1) + hashie (>= 3.4.6, < 3.6.0) + rack (>= 1.6.2, < 3) + omniauth-facebook (5.0.0) + omniauth-oauth2 (~> 1.2) + omniauth-github (1.3.0) + omniauth (~> 1.5) + omniauth-oauth2 (>= 1.4.0, < 2.0) + omniauth-google-oauth2 (0.5.3) + jwt (>= 1.5) + omniauth (>= 1.1.1) + omniauth-oauth2 (>= 1.5) + omniauth-mediawiki (0.0.3) + jwt (~> 1.0) + omniauth-oauth (~> 1.0) + omniauth-oauth (1.1.0) + oauth + omniauth (~> 1.0) + omniauth-oauth2 (1.5.0) + oauth2 (~> 1.1) + omniauth (~> 1.2) omniauth-openid (1.0.1) omniauth (~> 1.0) rack-openid (~> 1.3.1) - openstreetmap-i18n-js (3.0.0.rc5.3) - i18n - paperclip (4.2.1) - activemodel (>= 3.0.0) - activesupport (>= 3.0.0) - cocaine (~> 0.5.3) + omniauth-windowslive (0.0.12) + multi_json (~> 1.12) + omniauth-oauth2 (~> 1.4) + openstreetmap-deadlock_retry (1.3.0) + paperclip (5.3.0) + activemodel (>= 4.2.0) + activesupport (>= 4.2.0) mime-types - parser (2.2.0.3) - ast (>= 1.1, < 3.0) - pg (0.18.1) - poltergeist (1.6.0) - capybara (~> 2.1) + mimemagic (~> 0.3.0) + terrapin (~> 0.6.0) + parallel (1.12.1) + parser (2.5.1.2) + ast (~> 2.4.0) + pg (0.21.0) + poltergeist (1.18.1) + capybara (>= 2.1, < 4) cliver (~> 0.3.1) - multi_json (~> 1.0) websocket-driver (>= 0.2.0) - powerpack (0.1.0) - psych (2.0.13) - r2 (0.2.5) - rack (1.6.0) - rack-cors (0.3.1) + powerpack (0.1.2) + progress (3.4.0) + psych (3.0.2) + public_suffix (3.0.3) + puma (3.12.0) + quad_tile (1.0.1) + r2 (0.2.7) + rack (2.0.5) + rack-cors (1.0.2) rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-test (0.6.3) - rack (>= 1.0) - rails (4.2.1) - actionmailer (= 4.2.1) - actionpack (= 4.2.1) - actionview (= 4.2.1) - activejob (= 4.2.1) - activemodel (= 4.2.1) - activerecord (= 4.2.1) - activesupport (= 4.2.1) - bundler (>= 1.3.0, < 2.0) - railties (= 4.2.1) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.6) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.2) - loofah (~> 2.0) - rails-i18n (4.0.4) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rack-uri_sanitizer (0.0.2) + rails (5.2.0) + actioncable (= 5.2.0) + actionmailer (= 5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) + activemodel (= 5.2.0) + activerecord (= 5.2.0) + activestorage (= 5.2.0) + activesupport (= 5.2.0) + bundler (>= 1.3.0) + railties (= 5.2.0) + sprockets-rails (>= 2.0.0) + rails-controller-testing (1.0.2) + actionpack (~> 5.x, >= 5.0.1) + actionview (~> 5.x, >= 5.0.1) + activesupport (~> 5.x) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + rails-i18n (4.0.2) i18n (~> 0.6) - railties (~> 4.0) - railties (4.2.1) - actionpack (= 4.2.1) - activesupport (= 4.2.1) + rails (>= 4.0) + railties (5.2.0) + actionpack (= 5.2.0) + activesupport (= 5.2.0) + method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.0.0) - rake (10.4.2) - redcarpet (3.2.3) - ref (1.0.5) - rest-client (1.8.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 3.0) - netrc (~> 0.7) - rinku (1.7.3) - rubocop (0.30.0) - astrolabe (~> 1.3) - parser (>= 2.2.0.1, < 3.0) + rainbow (3.0.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + record_tag_helper (1.0.0) + actionview (~> 5.x) + redcarpet (3.4.0) + ref (2.0.0) + request_store (1.4.1) + rack (>= 1.4) + rinku (2.0.4) + rotp (3.3.1) + rubocop (0.59.1) + jaro_winkler (~> 1.5.1) + parallel (~> 1.10) + parser (>= 2.5, != 2.5.1.1) powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.4) + rainbow (>= 2.2.2, < 4.0) + ruby-progressbar (~> 1.7) + unicode-display_width (~> 1.0, >= 1.0.1) ruby-openid (2.7.0) - ruby-progressbar (1.7.5) - sanitize (3.1.2) - crass (~> 1.0.1) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + safe_yaml (1.0.4) + sanitize (4.6.6) + crass (~> 1.0.2) nokogiri (>= 1.4.4) - nokogumbo (= 1.2.0) - sass (3.4.13) - sass-rails (5.0.3) - railties (>= 4.0.0, < 5.0) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (~> 1.1) - simplecov (0.9.2) - docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.9.0) - simplecov-html (0.9.0) - soap4r-ruby1.9 (2.0.5) - sprockets (2.12.3) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.4) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) - term-ansicolor (1.3.0) + nokogumbo (~> 1.4) + sass (3.6.0) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sassc (1.12.1) + ffi (~> 1.9.6) + sass (>= 3.3.0) + sassc-rails (1.3.0) + railties (>= 4.0.0) + sass + sassc (~> 1.9) + sprockets (> 2.11) + sprockets-rails + tilt + secure_headers (6.0.0) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + term-ansicolor (1.6.0) tins (~> 1.0) - therubyracer (0.12.2) - libv8 (~> 3.16.14.0) + terrapin (0.6.0) + climate_control (>= 0.0.3, < 1.0) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) ref - thor (0.19.1) - thread_safe (0.3.5) - tilt (1.4.1) - timecop (0.7.3) - tins (1.3.5) - tzinfo (1.2.2) + thor (0.19.4) + thread_safe (0.3.6) + tilt (2.0.8) + tins (1.16.3) + tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (2.7.1) - execjs (>= 0.3.0) - json (>= 1.8.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.6) - validates_email_format_of (1.6.2) + uglifier (4.1.19) + execjs (>= 0.3.0, < 3) + unicode-display_width (1.4.0) + validates_email_format_of (1.6.3) i18n vendorer (0.1.16) - websocket-driver (0.5.4) + webmock (3.4.2) + addressable (>= 2.3.6) + crack (>= 0.3.2) + hashdiff + websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - xpath (2.0.0) - nokogiri (~> 1.3) + websocket-extensions (0.1.3) + xpath (3.1.0) + nokogiri (~> 1.8) PLATFORMS ruby DEPENDENCIES SystemTimer (>= 1.1.3) + aasm actionpack-page_caching - autoprefixer-rails + annotate + autoprefixer-rails (~> 8.6.3) + better_errors bigdecimal (~> 1.1.0) - coffee-rails (~> 4.1.0) - composite_primary_keys (~> 8.1.0) + binding_of_caller + bootsnap (>= 1.1.0) + canonical-rails + capybara (~> 2.13) + coffee-rails (~> 4.2) + composite_primary_keys (~> 11.0.0) coveralls dalli - deadlock_retry (>= 1.2.0) dynamic_form + factory_bot_rails faraday + geoip htmlentities http_accept_language (~> 2.0.0) - httpclient + i18n-js (>= 3.0.0) + image_optim_rails jquery-rails jshint json jsonify-rails kgio - konacha libxml-ruby (>= 2.0.5) + listen + logstasher minitest (~> 5.1) oauth-plugin (>= 0.5.1) omniauth + omniauth-facebook + omniauth-github + omniauth-google-oauth2 (>= 0.2.7) + omniauth-mediawiki (>= 0.0.3) omniauth-openid - openstreetmap-i18n-js (>= 3.0.0.rc5.3) - paperclip (~> 4.0) - pg + omniauth-windowslive + openstreetmap-deadlock_retry (>= 1.3.0) + paperclip (~> 5.2) + pg (~> 0.18) poltergeist psych - r2 + puma (~> 3.7) + quad_tile (~> 1.0.1) + r2 (~> 0.2.7) rack-cors - rails (= 4.2.1) + rack-uri_sanitizer + rails (= 5.2.0) + rails-controller-testing rails-i18n (~> 4.0.0) + record_tag_helper redcarpet rinku (>= 1.2.2) + rotp rubocop sanitize - sass-rails (~> 5.0) - soap4r-ruby1.9 - sprockets (~> 2.12.3) - timecop + sassc-rails + secure_headers uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1) vendorer + webmock + +BUNDLED WITH + 1.16.2