summaryrefslogtreecommitdiff
path: root/Gemfile.lock
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.lock
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.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 70c532f05de..6ad0b039c5c 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)
@@ -818,7 +818,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)