summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPirate Praveen <praveen@debian.org>2018-06-30 13:35:03 +0200
committerPirate Praveen <praveen@debian.org>2018-06-30 14:05:36 +0200
commit99e816bc80b3571bce40cca525d35724ee7ab968 (patch)
tree5803380f801bf95c797922738159d4c5aa1f6878
parent3a3233a5b9e4be15bedd9004c8520475fd38f5c5 (diff)
downloadgitlab-ce-99e816bc80b3571bce40cca525d35724ee7ab968.tar.gz
update html-pipeline 2.7.1 -> 2.8
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
-rw-r--r--Gemfile.rails5.lock4
3 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 82559fa731c..993c3c4b3e7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -132,7 +132,7 @@ gem 'unf', '~> 0.1.4'
gem 'seed-fu', '~> 2.3.7'
# Markdown and HTML processing
-gem 'html-pipeline', '~> 2.7.1'
+gem 'html-pipeline', '~> 2.8'
gem 'deckar01-task_list', '2.0.0'
gem 'gitlab-markup', '~> 1.6.4'
gem 'redcarpet', '~> 3.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index 79e3888fa64..637846e0330 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
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock
index 3159942b4c5..75d9db5f29a 100644
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -397,7 +397,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)
@@ -1071,7 +1071,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