diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-11 18:16:07 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-11 18:16:07 +0300 |
commit | 22999a6fa6b44a835536307da8e5d6a6b349cb49 (patch) | |
tree | 548d14cb639012185c405edc24655e652c8c121e | |
parent | a2a68858c88151ce0d77f602dbae59d595495ac6 (diff) |
Revert "Merge branch 'remove-redcloth' into 'master'
"
This reverts commit e426c027b0a2a3aa0dea1d833008f2bfd814f483, reversing
changes made to c3676aa156981092b7f03f1a3e74bb819cfa2fc3.
-rw-r--r-- | .gitlab-ci.yml | 3 | ||||
-rw-r--r-- | Gemfile | 1 | ||||
-rw-r--r-- | Gemfile.lock | 2 | ||||
-rw-r--r-- | spec/features/atom/users_spec.rb | 2 |
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 @@ -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 |