Commit 87e507c0 authored by Stan Hu's avatar Stan Hu

Fix HTML spew in Locked Files page

f366c5f9 added internationalization to
the Locked files pages, but it caused raw HTML to appear on the page
next to each locked file. We call #html_safe to make the tooltip
actually work.

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/9670
parent 3b1daa55
...@@ -9,4 +9,4 @@ ...@@ -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 = 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") = 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) }
---
title: Fix HTML spew in Locked Files page
merge_request:
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment