X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0e7cc08c7b1055341dc01cfdc331fac1a13964c1..391fb933f59075e36e9cea5ea35f5a5efdfc257e:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 08514dcda..5ddadc3e0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -87,7 +87,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.0.5) coveralls (0.8.22) json (>= 1.8, < 3) simplecov (~> 0.16.1) @@ -127,7 +127,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) @@ -305,7 +305,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) @@ -322,19 +323,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) @@ -443,7 +438,7 @@ DEPENDENCIES rotp rubocop sanitize - sassc-rails (~> 1.3) + sassc-rails secure_headers uglifier (>= 1.3.0) validates_email_format_of (>= 1.5.1)