diff --git a/Gemfile b/Gemfile index 224771f..ee600a6 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,7 @@ gem 'sdoc', '~> 0.4.0', group: :doc # TOJWebapp のために追加したよ gem 'devise' -gem 'redcarpet', '~> 2.3.0' +gem 'redcarpet', '~> 3.5.1' gem 'coderay' gem 'gretel' diff --git a/Gemfile.lock b/Gemfile.lock index 7796399..155cfaa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,6 +30,10 @@ GEM activemodel (= 4.2.8) activesupport (= 4.2.8) arel (~> 6.0) + activerecord-mysql-awesome (0.0.9) + activerecord (~> 4.0) + activesupport (~> 4.0) + mysql2 (>= 0.3.18) activesupport (4.2.8) i18n (~> 0.7) minitest (~> 5.1) @@ -122,7 +126,7 @@ GEM thor (>= 0.18.1, < 2.0) rake (12.0.0) rdoc (4.3.0) - redcarpet (2.3.0) + redcarpet (3.5.1) responders (2.1.1) railties (>= 4.2.0, < 5.1) ridgepole (0.6.6) @@ -178,6 +182,7 @@ PLATFORMS ruby DEPENDENCIES + activerecord-mysql-awesome byebug coderay coffee-rails (~> 4.1.0) @@ -188,7 +193,7 @@ DEPENDENCIES jquery-turbolinks mysql2 (< 0.5) rails (= 4.2.8) - redcarpet (~> 2.3.0) + redcarpet (~> 3.5.1) ridgepole sass-rails (~> 5.0) sdoc (~> 0.4.0)