summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-04-08 12:24:06 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-04-09 17:28:45 -0400
commitb142d449c6dbefbf16a55d53bd28867a682f341a (patch)
tree0f358b98964166cd8ad4f537f329af0be86cce96
parent6848312f3758dd895310b8367079dfd8a45903a2 (diff)
downloadgitlab-ce-b142d449c6dbefbf16a55d53bd28867a682f341a.tar.gz
Update redcarpet to 3.2.3
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index cce1f47ef15..a3720ce17f8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -94,7 +94,7 @@ gem 'html-pipeline-gitlab', '~> 0.1'
gem "github-markup"
# Required markup gems by github-markdown
-gem 'redcarpet', '~> 3.1.2'
+gem 'redcarpet', '~> 3.2.3'
gem 'RedCloth'
gem 'rdoc', '~>3.6'
gem 'org-ruby', '= 0.9.12'
diff --git a/Gemfile.lock b/Gemfile.lock
index d7a292d4e53..747dbe1b037 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -457,7 +457,7 @@ GEM
ffi (>= 0.5.0)
rdoc (3.12.2)
json (~> 1.4)
- redcarpet (3.1.2)
+ redcarpet (3.2.3)
redis (3.1.0)
redis-actionpack (4.0.0)
actionpack (~> 4)
@@ -755,7 +755,7 @@ DEPENDENCIES
rb-fsevent
rb-inotify
rdoc (~> 3.6)
- redcarpet (~> 3.1.2)
+ redcarpet (~> 3.2.3)
redis-rails
request_store
rspec-rails (= 2.99)