summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-11-24 15:42:42 -0500
committerRobert Speicher <rspeicher@gmail.com>2015-11-24 15:42:42 -0500
commit26f9dbf8a95d79eccf6a3dd3b779b7a7bc51c03b (patch)
tree25716441478f385ea178e84b34f82971b6992ffc
parent0fb5ffd8b0752f68db67414dc72d09ff0ef064d1 (diff)
downloadgitlab-ce-rs-update-creole.tar.gz
Bump creole to ~> 0.5.0rs-update-creole
Closes #2815
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index bd8e9bd8fa1..bcbdabb5d95 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'
diff --git a/Gemfile.lock b/Gemfile.lock
index 448941cfc8d..4d60d8fadc1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -134,7 +134,7 @@ GEM
thor (~> 0.19.1)
crack (0.4.2)
safe_yaml (~> 1.0.0)
- creole (0.3.8)
+ creole (0.5.0)
d3_rails (3.5.6)
railties (>= 3.1.0)
daemons (1.2.3)
@@ -816,7 +816,7 @@ DEPENDENCIES
colored (~> 1.2)
colorize (~> 0.5.8)
coveralls (~> 0.8.2)
- creole (~> 0.3.6)
+ creole (~> 0.5.0)
d3_rails (~> 3.5.5)
database_cleaner (~> 1.4.0)
default_value_for (~> 3.0.0)