summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2014-10-10 17:31:47 +0200
committerMarin Jankovski <maxlazio@gmail.com>2014-10-10 17:31:47 +0200
commit2ea166fc338f95cb9f6db1c61426dce4b2cfd8e1 (patch)
treebf2409c06076bc3e6f162b7bbf1a0796129335e7 /Gemfile.lock
parent4149fc24cfe4ffa2d0d950e7f930529a05899b7c (diff)
downloadgitlab-ce-2ea166fc338f95cb9f6db1c61426dce4b2cfd8e1.tar.gz
Make sure relative url and asset_host are honored, specs.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 517466f3d1a..a9b71fec133 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -241,7 +241,7 @@ GEM
html-pipeline (1.11.0)
activesupport (>= 2)
nokogiri (~> 1.4)
- html-pipeline-gitlab (0.1.4)
+ html-pipeline-gitlab (0.1.5)
actionpack (~> 4)
gitlab_emoji (~> 0.0.1)
html-pipeline (~> 1.11.0)