diff options
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6add217bc32..a2d9225fd85 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -680,7 +680,7 @@ GEM rack rack-protection (2.0.5) rack - rack-proxy (0.6.0) + rack-proxy (0.6.5) rack rack-test (1.1.0) rack (>= 1.0, < 3) @@ -718,7 +718,7 @@ GEM thor (>= 0.19.0, < 2.0) rainbow (3.0.0) raindrops (0.19.0) - rake (12.3.2) + rake (12.3.3) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) @@ -998,9 +998,11 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - webpack-rails (0.9.11) - railties (>= 3.2.0) - websocket-driver (0.7.0) + webpacker (4.0.7) + activesupport (>= 4.2) + rack-proxy (>= 0.6.1) + railties (>= 4.2) + websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) wikicloth (0.8.1) @@ -1179,7 +1181,6 @@ DEPENDENCIES rack-attack (~> 4.4.1) rack-cors (~> 1.0.0) rack-oauth2 (~> 1.9.3) - rack-proxy (~> 0.6.0) rack-timeout rails (= 5.2.3) rails-controller-testing @@ -1249,7 +1250,7 @@ DEPENDENCIES version_sorter (~> 2.2.4) vmstat (~> 2.3.0) webmock (~> 3.5.1) - webpack-rails (~> 0.9.10) + webpacker (~> 4.0) wikicloth (= 0.8.1) BUNDLED WITH |