diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-25 11:08:38 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-25 11:08:38 +0300 |
| commit | 4063141223f9b89248e3c33df5711201f75d3718 (patch) | |
| tree | c27773cb6dc4b1c55c16b20db62cb1e16eebbad0 | |
| parent | 9fe58f5a23f2960f666c4d641b463c744138d29c (diff) | |
| parent | e2ce29b1b4e6b71370d68a8d3f41207f66f31800 (diff) | |
Merge branch 'sh-bump-html-pipeline-2.8.4' into 'master'
Bump html-pipeline to 2.8.4
See merge request gitlab-org/gitlab-ce!20828
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 251e3c22397..5bb7bc53962 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -397,7 +397,7 @@ GEM hipchat (1.5.2) httparty mimemagic - html-pipeline (2.8.3) + html-pipeline (2.8.4) activesupport (>= 2) nokogiri (>= 1.4) html2text (0.2.0) |