Merge branch 'remove-redcloth' into 'master'

Remove RedCloth and no longer allow bundle-audit to fail

As far as I can see, RedCloth wasn't used at all.

See merge request !2037
This commit is contained in:
Dmitriy Zaporozhets 2015-12-09 16:59:30 +00:00
commit e426c027b0
4 changed files with 2 additions and 6 deletions

View file

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

View file

@ -93,7 +93,6 @@ 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'

View file

@ -2,7 +2,6 @@ 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,7 +825,6 @@ 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)

View file

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