Revert "Merge branch 'remove-redcloth' into 'master'
This reverts commite426c027b0
, reversing changes made toc3676aa156
.
This commit is contained in:
parent
a2a68858c8
commit
22999a6fa6
|
@ -123,3 +123,4 @@ bundler:audit:
|
||||||
tags:
|
tags:
|
||||||
- ruby
|
- ruby
|
||||||
- mysql
|
- mysql
|
||||||
|
allow_failure: true
|
||||||
|
|
1
Gemfile
1
Gemfile
|
@ -93,6 +93,7 @@ gem 'html-pipeline', '~> 1.11.0'
|
||||||
gem 'task_list', '~> 1.0.2', require: 'task_list/railtie'
|
gem 'task_list', '~> 1.0.2', require: 'task_list/railtie'
|
||||||
gem 'github-markup', '~> 1.3.1'
|
gem 'github-markup', '~> 1.3.1'
|
||||||
gem 'redcarpet', '~> 3.3.3'
|
gem 'redcarpet', '~> 3.3.3'
|
||||||
|
gem 'RedCloth', '~> 4.2.9'
|
||||||
gem 'rdoc', '~>3.6'
|
gem 'rdoc', '~>3.6'
|
||||||
gem 'org-ruby', '~> 0.9.12'
|
gem 'org-ruby', '~> 0.9.12'
|
||||||
gem 'creole', '~> 0.5.0'
|
gem 'creole', '~> 0.5.0'
|
||||||
|
|
|
@ -2,6 +2,7 @@ GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
CFPropertyList (2.3.2)
|
CFPropertyList (2.3.2)
|
||||||
|
RedCloth (4.2.9)
|
||||||
ace-rails-ap (2.0.1)
|
ace-rails-ap (2.0.1)
|
||||||
actionmailer (4.2.4)
|
actionmailer (4.2.4)
|
||||||
actionpack (= 4.2.4)
|
actionpack (= 4.2.4)
|
||||||
|
@ -826,6 +827,7 @@ PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
|
RedCloth (~> 4.2.9)
|
||||||
ace-rails-ap (~> 2.0.1)
|
ace-rails-ap (~> 2.0.1)
|
||||||
activerecord-deprecated_finders (~> 1.0.3)
|
activerecord-deprecated_finders (~> 1.0.3)
|
||||||
activerecord-session_store (~> 0.1.0)
|
activerecord-session_store (~> 0.1.0)
|
||||||
|
|
|
@ -79,6 +79,6 @@ describe "User Feed", feature: true do
|
||||||
end
|
end
|
||||||
|
|
||||||
def safe_name
|
def safe_name
|
||||||
CGI.escapeHTML(user.name)
|
html_escape(user.name)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue