summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-06-30 18:18:51 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-06-30 18:18:51 -0400
commitc5b9d4720e2924065e6eaf8479db274b8233078e (patch)
treee090a932199df8337d07b09d84e9d10d3e40527e
parenta7773dd7e57158ac9006c582b999a75f09d1ec21 (diff)
downloadgitlab-ce-rs-issue-1911.tar.gz
Bump Redcarpet to 3.3.2rs-issue-1911
Closes #1911
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index cebe957965f..eb3917872f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -94,7 +94,7 @@ gem "seed-fu"
gem 'html-pipeline', '~> 1.11.0'
gem 'task_list', '1.0.2', require: 'task_list/railtie'
gem 'github-markup'
-gem 'redcarpet', '~> 3.3.0'
+gem 'redcarpet', '~> 3.3.2'
gem 'RedCloth'
gem 'rdoc', '~>3.6'
gem 'org-ruby', '= 0.9.12'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6d39e3b94c5..718236ec39c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -502,7 +502,7 @@ GEM
trollop
rdoc (3.12.2)
json (~> 1.4)
- redcarpet (3.3.1)
+ redcarpet (3.3.2)
redis (3.1.0)
redis-actionpack (4.0.0)
actionpack (~> 4)
@@ -822,7 +822,7 @@ DEPENDENCIES
rails (= 4.1.11)
raphael-rails (~> 2.1.2)
rdoc (~> 3.6)
- redcarpet (~> 3.3.0)
+ redcarpet (~> 3.3.2)
redis-rails
request_store
rerun (~> 0.10.0)