diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-12 18:33:27 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-12 18:33:27 +0000 |
| commit | b09fd2337a20e7d45cb9ef6ac1f4dde0d0e43e2a (patch) | |
| tree | 0098dca7f7f0740d8082aa86e9e95c3683ab55d6 /Gemfile.lock | |
| parent | f7342ce56764aaf6465bca74239955778c25107b (diff) | |
| parent | 2ea166fc338f95cb9f6db1c61426dce4b2cfd8e1 (diff) | |
| download | gitlab-ce-b09fd2337a20e7d45cb9ef6ac1f4dde0d0e43e2a.tar.gz | |
Merge branch 'enabling_markdown_pipelines_from_gitlab' into 'master'
Enabling markdown pipelines from gitlab
Define which markdown pipelines are used in GitLab from application instead from gem.
See merge request !1164
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1de2911fb15..0e82f14ca9d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -241,9 +241,11 @@ GEM html-pipeline (1.11.0) activesupport (>= 2) nokogiri (~> 1.4) - html-pipeline-gitlab (0.1.0) - gitlab_emoji (~> 0.0.1.1) + html-pipeline-gitlab (0.1.5) + actionpack (~> 4) + gitlab_emoji (~> 0.0.1) html-pipeline (~> 1.11.0) + sanitize (~> 2.1) http_parser.rb (0.5.3) httparty (0.13.0) json (~> 1.8) |