diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 2 insertions, 8 deletions
@@ -88,7 +88,7 @@ gem "six" gem "seed-fu" # Markup pipeline for GitLab -gem 'html-pipeline-gitlab', '~> 0.1' +gem 'html-pipeline', '~> 1.11.0' # Markdown to HTML gem "github-markup" 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) |