summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2014-09-01 17:47:28 +0200
committerRobert Schilling <rschilling@student.tugraz.at>2014-09-26 01:32:33 +0200
commit390183a4269684f64e2e290869bee21cf18bf160 (patch)
tree6f23a073c64509f7ceded3bf119baf3134cb45c1 /Gemfile.lock
parent9cd5ff043a72001201b4c8192a45f8029ebe84ac (diff)
downloadgitlab-ce-390183a4269684f64e2e290869bee21cf18bf160.tar.gz
Factor out Emoji parsing using html-pipeline-gitlab
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock7
1 files changed, 7 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index bd7ebf3ef44..a2660342ac6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -239,6 +239,12 @@ GEM
hipchat (0.14.0)
httparty
httparty
+ html-pipeline (1.11.0)
+ activesupport (>= 2)
+ nokogiri (~> 1.4)
+ html-pipeline-gitlab (0.1.0)
+ gitlab_emoji (~> 0.0.1.1)
+ html-pipeline (~> 1.11.0)
http_parser.rb (0.5.3)
httparty (0.13.0)
json (~> 1.8)
@@ -629,6 +635,7 @@ DEPENDENCIES
guard-spinach
haml-rails
hipchat (~> 0.14.0)
+ html-pipeline-gitlab (~> 0.1.0)
httparty
jasmine (= 2.0.2)
jquery-atwho-rails (~> 0.3.3)