diff options
| author | John Cai <jcai@gitlab.com> | 2020-01-11 20:04:20 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2020-01-11 20:04:20 +0300 |
| commit | b8e5b03ed999ddb5a89e2122aa0706fc09217d19 (patch) | |
| tree | e85d019beb681cd806fbf7f0426883db857f25dd | |
| parent | 7ccb4a0c918b5544653af59e85775a912352868e (diff) | |
| parent | b092adee7dbfb26fac62b9a249dc16214ea4b9fc (diff) | |
Merge branch 'sh-update-loofah-and-crass' into 'master'
Update loofah and crass gems to match GitLab CE/EE
See merge request gitlab-org/gitaly!1752
| -rw-r--r-- | changelogs/unreleased/sh-update-loofah-and-crass.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changelogs/unreleased/sh-update-loofah-and-crass.yml b/changelogs/unreleased/sh-update-loofah-and-crass.yml new file mode 100644 index 000000000..f877637a2 --- /dev/null +++ b/changelogs/unreleased/sh-update-loofah-and-crass.yml @@ -0,0 +1,5 @@ +--- +title: Update loofah and crass gems to match GitLab CE/EE +merge_request: 1752 +author: +type: other diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index f359af158..c095ad39f 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -36,7 +36,7 @@ GEM concurrent-ruby (1.1.5) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.4) + crass (1.0.5) diff-lcs (1.3) docile (1.3.2) equalizer (0.0.11) @@ -99,7 +99,7 @@ GEM licensee (8.9.2) rugged (~> 0.24) listen (0.5.3) - loofah (2.3.1) + loofah (2.4.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) |