Merge branch 'sh-fix-bad-html-path-locks' into 'master'

Fix HTML spew in Locked Files page

Closes #9670

See merge request gitlab-org/gitlab-ee!9810

ee/app/views/projects/path_locks/_path_lock.html.haml

@@ -9,4 +9,4 @@
         = link_to project_path_lock_path(@project, path_lock), class: 'btn btn-grouped btn-sm btn-remove remove-row has-tooltip', title: _("Unlock"), method: :delete, data: { confirm: _("Are you sure you want to unlock %{path_lock_path}?") % { path_lock_path: path_lock.path }, container: 'body' }, remote: true do
           = icon("trash-o")
 
-  = _("locked by %{path_lock_user_name} %{created_at}") % { path_lock_user_name: path_lock.user.name, created_at: time_ago_with_tooltip(path_lock.created_at) }
+  = _("locked by %{path_lock_user_name} %{created_at}").html_safe % { path_lock_user_name: path_lock.user.name, created_at: time_ago_with_tooltip(path_lock.created_at) }

ee/changelogs/unreleased/sh-fix-bad-html-path-locks.yml

+---
+title: Fix HTML spew in Locked Files page
+merge_request:
+author:
+type: fixed