aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvlatka pavisic2016-11-30 16:11:15 +0100
committervlatka pavisic2016-11-30 16:11:15 +0100
commit7d644e5cf2610aec88c0d5c6a1f4fa63b442cc42 (patch)
tree37ec244f11bd02572e3c9f38e509a952307f4086
parentec923ea9bf980a846d5b3d588796fc4ac528adaf (diff)
downloadchouette-core-7d644e5cf2610aec88c0d5c6a1f4fa63b442cc42.tar.bz2
Refs #2072 : Upgrade RedCloth
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock5
2 files changed, 3 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 7bd3de603..8de4a2df3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -87,7 +87,7 @@ gem 'calendar_helper', '0.2.5'
gem 'cocoon'
gem 'slim-rails', '~> 3.1'
gem 'formtastic', '2.3.1'
-gem 'RedCloth'
+gem 'RedCloth', '~> 4.3.0'
gem 'simple_form', '~> 3.1.0'
gem 'font-awesome-sass', '~> 4.2.0'
gem 'will_paginate-bootstrap', '~> 1.0.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index e55006fef..43ca0b023 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -32,8 +32,7 @@ GEM
remote: http://rubygems.org/
remote: http://rails-assets.org/
specs:
- RedCloth (4.2.9)
- RedCloth (4.2.9-java)
+ RedCloth (4.3.2)
SyslogLogger (2.0)
aasm (4.5.2)
actionmailer (4.1.10)
@@ -585,7 +584,7 @@ PLATFORMS
ruby
DEPENDENCIES
- RedCloth
+ RedCloth (~> 4.3.0)
SyslogLogger
aasm
active_attr