Merge branch 'revert-2037' into 'master'

Revert removal of RedCloth

Revert !2037.

See merge request !2071

4 files changed, 6 insertions, 2 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c614e14e243..a8da3de83f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/Gemfile b/Gemfile
index 582a1624f05..7298e21ce66 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0db1c6760f8..ff57460f5bb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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)
diff --git a/spec/features/atom/users_spec.rb b/spec/features/atom/users_spec.rb
index 52134556339..dc41be8246f 100644
--- a/spec/features/atom/users_spec.rb
+++ b/spec/features/atom/users_spec.rb
@@ -79,6 +79,6 @@ describe "User Feed", feature: true  do
   end
 
   def safe_name
-    CGI.escapeHTML(user.name)
+    html_escape(user.name)
   end
 end