X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ac2d598f2f3fe5e7735a208cc4826d43753840e7..ea68ac865ba4df5686ac111d4bd8679dc2a643a8:/Gemfile.lock?ds=sidebyside diff --git a/Gemfile.lock b/Gemfile.lock index b511334f2..7b871ff7c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) - aasm (5.0.2) + aasm (5.0.3) concurrent-ruby (~> 1.0) actioncable (5.2.3) actionpack (= 5.2.3) @@ -53,8 +53,8 @@ GEM tzinfo (~> 1.1) addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) - annotate (2.7.4) - activerecord (>= 3.2, < 6.0) + annotate (2.7.5) + activerecord (>= 3.2, < 7.0) rake (>= 10.4, < 13.0) arel (9.0.0) ast (2.4.0) @@ -75,11 +75,11 @@ GEM bigdecimal (1.1.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootsnap (1.4.2) + bootsnap (1.4.4) msgpack (~> 1.0) browser (2.5.3) builder (3.2.3) - cancancan (2.3.0) + cancancan (3.0.1) canonical-rails (0.2.5) rails (>= 4.1, < 6.1) capybara (2.18.0) @@ -99,6 +99,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) + colorize (0.8.1) composite_primary_keys (11.1.0) activerecord (~> 5.2.1) concurrent-ruby (1.1.5) @@ -106,11 +107,11 @@ GEM activesupport (>= 3.0) deep_merge (~> 1.2.1) dry-validation (>= 0.12.2) - coveralls (0.8.22) + coveralls (0.8.23) json (>= 1.8, < 3) simplecov (~> 0.16.1) term-ansicolor (~> 1.3) - thor (~> 0.19.4) + thor (>= 0.19.4, < 2.0) tins (~> 1.6) crack (0.4.3) safe_yaml (~> 1.0.0) @@ -134,8 +135,8 @@ GEM concurrent-ruby (~> 1.0) dry-equalizer (0.2.2) dry-inflector (0.1.2) - dry-logic (0.5.0) - dry-container (~> 0.2, >= 0.2.6) + dry-logic (0.6.1) + concurrent-ruby (~> 1.0) dry-core (~> 0.2) dry-equalizer (~> 0.2) dry-types (0.14.1) @@ -161,14 +162,18 @@ GEM rubocop (~> 0.51) smart_properties erubi (1.8.0) + eslint-rails-ee (1.0.2) + colorize + execjs + railties (>= 3.2) execjs (2.7.0) exifr (1.3.6) factory_bot (5.0.2) activesupport (>= 4.2.0) - factory_bot_rails (5.0.1) - factory_bot (~> 5.0.0) + factory_bot_rails (5.0.2) + factory_bot (~> 5.0.2) railties (>= 4.2.0) - fakefs (0.20.0) + fakefs (0.20.1) faraday (0.15.4) multipart-post (>= 1.2, < 3) ffi (1.10.0) @@ -178,7 +183,7 @@ GEM geoip (1.6.4) globalid (0.4.2) activesupport (>= 4.2.0) - hashdiff (0.3.8) + hashdiff (0.3.9) hashie (3.6.0) html_tokenizer (0.0.7) htmlentities (4.3.4) @@ -204,10 +209,6 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jshint (1.5.0) - execjs (>= 1.4.0) - multi_json (~> 1.0) - therubyracer (~> 0.12.1) json (2.2.0) jsonify (0.3.1) multi_json (~> 1.0) @@ -220,7 +221,9 @@ GEM 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.3.0) activesupport (>= 4.0) @@ -236,17 +239,17 @@ GEM method_source (0.9.2) mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) + mime-types-data (3.2019.0331) mimemagic (0.3.3) mini_mime (1.0.1) mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.2.9) + msgpack (1.2.10) multi_json (1.13.1) multi_xml (0.6.0) - multipart-post (2.0.0) + multipart-post (2.1.0) nio4r (2.3.1) - nokogiri (1.10.2) + nokogiri (1.10.3) mini_portile2 (~> 2.4.0) nokogumbo (2.0.1) nokogiri (~> 1.8, >= 1.8.4) @@ -296,10 +299,10 @@ GEM mime-types mimemagic (~> 0.3.0) terrapin (~> 0.6.0) - parallel (1.16.0) - parser (2.6.2.0) + parallel (1.17.0) + parser (2.6.3.0) ast (~> 2.4.0) - pg (0.21.0) + pg (1.1.4) poltergeist (1.18.1) capybara (>= 2.1, < 4) cliver (~> 0.3.1) @@ -310,7 +313,7 @@ GEM puma (3.12.1) quad_tile (1.0.1) r2 (0.2.7) - rack (2.0.6) + rack (2.0.7) rack-cors (1.0.3) rack-openid (1.3.1) rack (>= 1.1.0) @@ -351,6 +354,7 @@ GEM thor (>= 0.19.0, < 2.0) rainbow (3.0.0) rake (12.3.2) + rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) record_tag_helper (1.0.0) @@ -358,19 +362,21 @@ GEM ref (2.0.0) request_store (1.4.1) rack (>= 1.4) - rinku (2.0.4) + rinku (2.0.6) rotp (4.1.0) addressable (~> 2.5) - rubocop (0.66.0) + rubocop (0.68.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) - psych (>= 3.1.0) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.6) + rubocop-performance (1.2.0) + rubocop (>= 0.68.0) ruby-openid (2.7.0) ruby-progressbar (1.10.0) + ruby_dep (1.5.0) safe_yaml (1.0.5) sanitize (5.0.0) crass (~> 1.0.2) @@ -379,7 +385,7 @@ GEM sassc (2.0.1) ffi (~> 1.9) rake - sassc-rails (2.1.0) + sassc-rails (2.1.1) railties (>= 4.0.0) sassc (>= 2.0) sprockets (> 3.0) @@ -406,7 +412,7 @@ GEM therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - thor (0.19.4) + thor (0.20.3) thread_safe (0.3.6) tilt (2.0.9) tins (1.20.2) @@ -455,6 +461,8 @@ DEPENDENCIES delayed_job_active_record dynamic_form erb_lint + eslint-rails-ee + execjs factory_bot_rails fakefs faraday @@ -465,7 +473,6 @@ DEPENDENCIES i18n-js (>= 3.0.0) image_optim_rails jquery-rails - jshint json jsonify-rails kgio @@ -484,7 +491,7 @@ DEPENDENCIES omniauth-windowslive openstreetmap-deadlock_retry (>= 1.3.0) paperclip (~> 5.2) - pg (~> 0.18) + pg poltergeist psych puma (~> 3.7) @@ -496,16 +503,18 @@ DEPENDENCIES rails-controller-testing rails-i18n (~> 4.0.0) record_tag_helper - rinku (= 2.0.4) + rinku (>= 2.0.6) rotp rubocop + rubocop-performance sanitize sassc-rails secure_headers + therubyracer uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1) vendorer webmock BUNDLED WITH - 1.16.2 + 1.17.2