diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-07-04 08:09:34 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-07-04 08:09:34 +0000 |
| commit | 4854cfef98d7158bea72b0c29363bf05044e5b67 (patch) | |
| tree | f46d4487499bca8951881303a3bcb21427903088 /Gemfile.lock | |
| parent | 8678cf9b9c6dfa6cd6bd15822fd901d752c77dc1 (diff) | |
| parent | d699362a0931427354a40246b72747837ad85fcb (diff) | |
| download | gitlab-ce-4854cfef98d7158bea72b0c29363bf05044e5b67.tar.gz | |
Merge branch 'pravi/gitlab-ce-update-html-pipeline' into 'master'
update html-pipeline 2.7.1 -> 2.8
Closes #48571
See merge request gitlab-org/gitlab-ce!20348
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1cd336c95d0..a4784cc6499 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -394,7 +394,7 @@ GEM hipchat (1.5.2) httparty mimemagic - html-pipeline (2.7.1) + html-pipeline (2.8.3) activesupport (>= 2) nokogiri (>= 1.4) html2text (0.2.0) @@ -1061,7 +1061,7 @@ DEPENDENCIES hashie-forbidden_attributes health_check (~> 2.6.0) hipchat (~> 1.5.0) - html-pipeline (~> 2.7.1) + html-pipeline (~> 2.8) html2text httparty (~> 0.13.3) icalendar |