summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2014-10-10 12:51:00 +0200
committerMarin Jankovski <maxlazio@gmail.com>2014-10-10 12:51:00 +0200
commit4149fc24cfe4ffa2d0d950e7f930529a05899b7c (patch)
tree2dccd2fa56d5b9ced3f62ffdf874f9c912df9301 /Gemfile.lock
parentb4828f4cf6405d27c01cc5be42334dd29a27285b (diff)
downloadgitlab-ce-4149fc24cfe4ffa2d0d950e7f930529a05899b7c.tar.gz
Bump html-pipeline-gitlab gem version
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 4 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index babb23ed606..517466f3d1a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -241,9 +241,11 @@ GEM
html-pipeline (1.11.0)
activesupport (>= 2)
nokogiri (~> 1.4)
- html-pipeline-gitlab (0.1.0)
- gitlab_emoji (~> 0.0.1.1)
+ html-pipeline-gitlab (0.1.4)
+ actionpack (~> 4)
+ gitlab_emoji (~> 0.0.1)
html-pipeline (~> 1.11.0)
+ sanitize (~> 2.1)
http_parser.rb (0.5.3)
httparty (0.13.0)
json (~> 1.8)