Revert "Merge branch 'remove-redcloth' into 'master'

This reverts commit e426c027b0, reversing
changes made to c3676aa156.
This commit is contained in:
Douwe Maan 2015-12-11 16:16:07 +01:00
parent a2a68858c8
commit 22999a6fa6
4 changed files with 6 additions and 2 deletions

View File

@ -117,9 +117,10 @@ flay:
- mysql
bundler:audit:
script:
script:
- "bundle exec bundle-audit update"
- "bundle exec bundle-audit check"
tags:
- ruby
- mysql
allow_failure: true

View File

@ -93,6 +93,7 @@ gem 'html-pipeline', '~> 1.11.0'
gem 'task_list', '~> 1.0.2', require: 'task_list/railtie'
gem 'github-markup', '~> 1.3.1'
gem 'redcarpet', '~> 3.3.3'
gem 'RedCloth', '~> 4.2.9'
gem 'rdoc', '~>3.6'
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'

View File

@ -2,6 +2,7 @@ GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.3.2)
RedCloth (4.2.9)
ace-rails-ap (2.0.1)
actionmailer (4.2.4)
actionpack (= 4.2.4)
@ -826,6 +827,7 @@ PLATFORMS
ruby
DEPENDENCIES
RedCloth (~> 4.2.9)
ace-rails-ap (~> 2.0.1)
activerecord-deprecated_finders (~> 1.0.3)
activerecord-session_store (~> 0.1.0)

View File

@ -79,6 +79,6 @@ describe "User Feed", feature: true do
end
def safe_name
CGI.escapeHTML(user.name)
html_escape(user.name)
end
end