diff options
| author | John Cai <jcai@gitlab.com> | 2019-12-06 22:19:07 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-12-06 22:19:07 +0300 |
| commit | 98ebc41ace0cd2197caa58f838db979834b8670d (patch) | |
| tree | 2de6065abc8372b935de155528cddcd1425e7a78 | |
| parent | 136cd9c712acdad40f61c2b0d342d02bea933e4e (diff) | |
| parent | 78d11f211c652061d7db8717f0e2db3a49008572 (diff) | |
Merge branch 'sh-update-loofah-gem' into 'master'
Update loofah gem to v2.3.1
See merge request gitlab-org/gitaly!1678
| -rw-r--r-- | changelogs/unreleased/sh-update-loofah-gem.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/sh-update-loofah-gem.yml b/changelogs/unreleased/sh-update-loofah-gem.yml new file mode 100644 index 000000000..ec5340be5 --- /dev/null +++ b/changelogs/unreleased/sh-update-loofah-gem.yml @@ -0,0 +1,5 @@ +--- +title: Update loofah gem to v2.3.1 +merge_request: 1678 +author: +type: security diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 8aedda85c..306b70d82 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.3.0) + loofah (2.3.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) |