summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2014-10-09 11:49:28 +0200
committerMarin Jankovski <maxlazio@gmail.com>2014-10-09 11:49:28 +0200
commitf7dc15c6bdb75a5f611c389ece3fe251f94a2d8f (patch)
tree2c04f16a9fa08df98a432949f1230c8a18ebc22f /Gemfile.lock
parentd9aa3f92159a6d422f570ffbe776fc09b708f1f7 (diff)
downloadgitlab-ce-f7dc15c6bdb75a5f611c389ece3fe251f94a2d8f.tar.gz
Revert "Up version of html-pipeline-gitlab."
This reverts commit 17835f095fb10168d5d2f6b2fd4c136844c2bfd1.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock5
1 files changed, 2 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 3eb52d984d7..babb23ed606 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -241,10 +241,9 @@ GEM
html-pipeline (1.11.0)
activesupport (>= 2)
nokogiri (~> 1.4)
- html-pipeline-gitlab (0.1.3)
- gitlab_emoji (~> 0.0.1)
+ html-pipeline-gitlab (0.1.0)
+ gitlab_emoji (~> 0.0.1.1)
html-pipeline (~> 1.11.0)
- sanitize (~> 2.1)
http_parser.rb (0.5.3)
httparty (0.13.0)
json (~> 1.8)