diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-04-16 16:41:51 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-04-21 12:53:42 -0400 |
| commit | 837dc328bf1632e80de4c288a13eb22661177ca5 (patch) | |
| tree | 29c4b2f6e6bb5bc3df7cc32b869a9cdb898eaf6e /Gemfile.lock | |
| parent | d7f61affaf845f44b4cc995e34eb1606c47c8eff (diff) | |
| download | gitlab-ce-837dc328bf1632e80de4c288a13eb22661177ca5.tar.gz | |
Change html-pipeline-gitlab gem to html-pipeline
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a134fbf6bf4..8f66476ad63 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -278,12 +278,6 @@ GEM html-pipeline (1.11.0) activesupport (>= 2) nokogiri (~> 1.4) - html-pipeline-gitlab (0.2.0) - actionpack (~> 4) - gitlab_emoji (~> 0.1) - html-pipeline (~> 1.11.0) - mime-types - sanitize (~> 2.1) http_parser.rb (0.5.3) httparty (0.13.3) json (~> 1.8) @@ -717,7 +711,7 @@ DEPENDENCIES guard-spinach haml-rails hipchat (~> 1.5.0) - html-pipeline-gitlab (~> 0.1) + html-pipeline (~> 1.11.0) httparty jasmine (= 2.0.2) jquery-atwho-rails (~> 0.3.3) |