diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-02 12:18:40 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-02 12:18:40 +0400 |
| commit | 6c3ad0dab639203961f8b3b2e59ffe78e9a21581 (patch) | |
| tree | ec4c05f4948253b852aead1b7a4a1ca662c8de87 /Gemfile.lock | |
| parent | 51bc636eb34934747f7808b2fc0cd59e9cb8e6b6 (diff) | |
| parent | 390183a4269684f64e2e290869bee21cf18bf160 (diff) | |
Merge pull request #7853 from Razer6/feature/html_pipeline
Factor out Emoji parsing using html-pipeline-gitlab
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9c49b1d74e2..d90ff63f805 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) @@ -630,6 +636,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) |