diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2019-10-21 23:48:35 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2019-10-21 23:48:35 +0300 |
| commit | b69f0b8837eca8ebe716ef03338292a185b0ce65 (patch) | |
| tree | 36c40c32d688da32cb0dce2332674babc080607e | |
| parent | 6dd21b919ce6cc33d96be6b80185e016eda80df6 (diff) | |
| parent | 1b8855b211fed42641d89212bbcfb1d5fb46dedc (diff) | |
Merge branch 'sh-upgrade-sanitizer-gem' into 'master'
Update rails-html-sanitizer and loofah gems in gitaly-ruby
See merge request gitlab-org/gitaly!1566
| -rw-r--r-- | changelogs/unreleased/sh-upgrade-sanitizer-gem.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/changelogs/unreleased/sh-upgrade-sanitizer-gem.yml b/changelogs/unreleased/sh-upgrade-sanitizer-gem.yml new file mode 100644 index 000000000..f841e619c --- /dev/null +++ b/changelogs/unreleased/sh-upgrade-sanitizer-gem.yml @@ -0,0 +1,5 @@ +--- +title: Update rails-html-sanitizer and loofah gems in gitaly-ruby +merge_request: 1566 +author: +type: other diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index b84a30ecb..063ed8eb6 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -99,7 +99,7 @@ GEM licensee (8.9.2) rugged (~> 0.24) listen (0.5.3) - loofah (2.2.3) + loofah (2.3.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -138,8 +138,8 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.2.0) - loofah (~> 2.2, >= 2.2.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) rainbow (3.0.0) rbtrace (0.4.11) ffi (>= 1.0.6) |