Merge branch 'rs-update-creole' into 'master'

Bump creole to ~> 0.5.0 Closes #2815 See merge request !1890

Merge branch 'rs-update-creole' into 'master'
cbdccf66 · Dmitriy Zaporozhets · 1c8fa3b2 · 26f9dbf8 · cbdccf66 · cbdccf66
Commit cbdccf66 authored Nov 25, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- 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'


--- 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)