summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-25 09:00:38 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-25 09:00:38 +0000
commitcbdccf66bfbe27718e8d976579d74a18aa8586c8 (patch)
treeb6f45edeef18d1d7b28e014763d00e1afd7460b1 /Gemfile
parent1c8fa3b2556559c84b2ba96311544299aea4ef73 (diff)
parent26f9dbf8a95d79eccf6a3dd3b779b7a7bc51c03b (diff)
downloadgitlab-ce-cbdccf66bfbe27718e8d976579d74a18aa8586c8.tar.gz
Merge branch 'rs-update-creole' into 'master'
Bump creole to ~> 0.5.0 Closes #2815 See merge request !1890
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 3bb9448e405..25f1a0b9ef3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -95,7 +95,7 @@ gem 'redcarpet', '~> 3.3.3'
gem 'RedCloth', '~> 4.2.9'
gem 'rdoc', '~>3.6'
gem 'org-ruby', '~> 0.9.12'
-gem 'creole', '~>0.3.6'
+gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 1.5.2'