diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-04-15 08:53:42 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-04-15 08:53:42 +0000 |
| commit | d83eb63beef28a6229b4bf851ee34c51938e29c7 (patch) | |
| tree | 3bce6dda5073f636857ac2f9de3a42a7605cd212 /Gemfile.lock | |
| parent | 8ede9d188e20d9e173fa6f0c5d899771a392b78a (diff) | |
| parent | da026ac2eca6126bf176ace5d70426db41239a58 (diff) | |
| download | gitlab-ce-d83eb63beef28a6229b4bf851ee34c51938e29c7.tar.gz | |
Merge branch '17014-remove-rails-deprecated_sanitizer' into 'master'
Resolve "Remove rails-deprecated_sanitizer"
Closes #17014
See merge request gitlab-org/gitlab-ce!27268
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c1d1a50799f..109958e2591 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -654,8 +654,6 @@ GEM actionpack (~> 5.x, >= 5.0.1) actionview (~> 5.x, >= 5.0.1) activesupport (~> 5.x) - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -1111,7 +1109,6 @@ DEPENDENCIES rack-proxy (~> 0.6.0) rails (= 5.0.7.2) rails-controller-testing - rails-deprecated_sanitizer (~> 1.0.3) rails-i18n (~> 5.1) rainbow (~> 3.0) raindrops (~> 0.18) |