diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-11 16:16:07 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-11 16:16:07 +0100 |
commit | 22999a6fa6b44a835536307da8e5d6a6b349cb49 (patch) | |
tree | 548d14cb639012185c405edc24655e652c8c121e /spec/features/atom | |
parent | a2a68858c88151ce0d77f602dbae59d595495ac6 (diff) | |
download | gitlab-ce-22999a6fa6b44a835536307da8e5d6a6b349cb49.tar.gz |
Revert "Merge branch 'remove-redcloth' into 'master'
"revert-2037
This reverts commit e426c027b0a2a3aa0dea1d833008f2bfd814f483, reversing
changes made to c3676aa156981092b7f03f1a3e74bb819cfa2fc3.
Diffstat (limited to 'spec/features/atom')
-rw-r--r-- | spec/features/atom/users_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |