X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/00f82918e6b77b475b0ddd51b8df45bf8fda51a1..9bd634405b29b80df1101f07cea99e35e05cf961:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 033fed118..6472d586a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,6 +29,8 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) + active_record_union (1.3.0) + activerecord (>= 4.0) activejob (5.2.0) activesupport (= 5.2.0) globalid (>= 0.3.6) @@ -66,6 +68,7 @@ GEM bootsnap (1.3.2) msgpack (~> 1.0) builder (3.2.3) + cancancan (2.3.0) canonical-rails (0.2.4) rails (>= 4.1, < 5.3) capybara (2.18.0) @@ -87,7 +90,7 @@ GEM coffee-script-source (1.12.2) composite_primary_keys (11.0.3) activerecord (~> 5.2.0) - concurrent-ruby (1.1.0) + concurrent-ruby (1.1.3) coveralls (0.8.22) json (>= 1.8, < 3) simplecov (~> 0.16.1) @@ -99,6 +102,11 @@ GEM crass (1.0.4) dalli (2.7.9) debug_inspector (0.0.3) + delayed_job (4.1.5) + activesupport (>= 3.0, < 5.3) + delayed_job_active_record (4.1.3) + activerecord (>= 3.0, < 5.3) + delayed_job (>= 3.0, < 5) docile (1.3.1) dynamic_form (1.1.4) erubi (1.7.1) @@ -122,7 +130,7 @@ GEM http_accept_language (2.0.5) i18n (0.9.5) concurrent-ruby (~> 1.0) - i18n-js (3.0.11) + i18n-js (3.1.0) i18n (>= 0.6.6, < 2) image_optim (0.26.3) exifr (~> 1.2, >= 1.2.2) @@ -171,7 +179,7 @@ GEM mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) - method_source (0.9.0) + method_source (0.9.1) mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) @@ -249,7 +257,7 @@ GEM puma (3.12.0) quad_tile (1.0.1) r2 (0.2.7) - rack (2.0.5) + rack (2.0.6) rack-cors (1.0.2) rack-openid (1.3.1) rack (>= 1.1.0) @@ -300,7 +308,8 @@ GEM request_store (1.4.1) rack (>= 1.4) rinku (2.0.4) - rotp (3.3.1) + rotp (4.0.2) + addressable (~> 2.5) rubocop (0.60.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -317,19 +326,13 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.8.0) nokogumbo (~> 2.0) - 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) + sassc (2.0.0) ffi (~> 1.9.6) - sass (>= 3.3.0) - sassc-rails (1.3.0) + rake + sassc-rails (2.0.0) railties (>= 4.0.0) - sass - sassc (~> 1.9) - sprockets (> 2.11) + sassc (>= 2.0) + sprockets (> 3.0) sprockets-rails tilt secure_headers (6.0.0) @@ -345,7 +348,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - term-ansicolor (1.6.0) + term-ansicolor (1.7.0) tins (~> 1.0) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) @@ -355,7 +358,7 @@ GEM thor (0.19.4) thread_safe (0.3.6) tilt (2.0.8) - tins (1.17.0) + tins (1.18.0) tzinfo (1.2.5) thread_safe (~> 0.1) uglifier (4.1.19) @@ -381,18 +384,21 @@ DEPENDENCIES SystemTimer (>= 1.1.3) aasm actionpack-page_caching + active_record_union annotate autoprefixer-rails (~> 8.6.3) better_errors bigdecimal (~> 1.1.0) binding_of_caller bootsnap (>= 1.1.0) + cancancan canonical-rails capybara (~> 2.13) coffee-rails (~> 4.2) composite_primary_keys (~> 11.0.0) coveralls dalli + delayed_job_active_record dynamic_form factory_bot_rails faraday @@ -437,7 +443,7 @@ DEPENDENCIES rotp rubocop sanitize - sassc-rails (~> 1.3) + sassc-rails secure_headers uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1)