Commit 5ddd4f0f authored by Sean McGivern's avatar Sean McGivern

Merge branch 'contribute/fix-project-name-members-page' into 'master'

Don't sanitize project names on project members page

Closes #58751

See merge request gitlab-org/gitlab-ce!25946
parents 1b6fe3ae 83fb62d4
.card.project-members-groups .card.project-members-groups
.card-header .card-header
= _("Groups with access to <strong>%{project_name}</strong>").html_safe % { project_name: sanitize_project_name(@project.name) } = _("Groups with access to <strong>%{project_name}</strong>").html_safe % { project_name: sanitize(@project.name, tags: []) }
%span.badge.badge-pill= group_links.size %span.badge.badge-pill= group_links.size
%ul.content-list.members-list %ul.content-list.members-list
= render partial: 'shared/members/group', collection: group_links, as: :group_link = render partial: 'shared/members/group', collection: group_links, as: :group_link
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.card .card
.card-header.flex-project-members-panel .card-header.flex-project-members-panel
%span.flex-project-title %span.flex-project-title
= _("Members of <strong>%{project_name}</strong>").html_safe % { project_name: sanitize_project_name(project.name) } = _("Members of <strong>%{project_name}</strong>").html_safe % { project_name: sanitize(project.name, tags: []) }
%span.badge.badge-pill= members.total_count %span.badge.badge-pill= members.total_count
= form_tag project_project_members_path(project), method: :get, class: 'form-inline member-search-form flex-project-members-form' do = form_tag project_project_members_path(project), method: :get, class: 'form-inline member-search-form flex-project-members-form' do
.form-group .form-group
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
= _("Project members") = _("Project members")
- if can?(current_user, :admin_project_member, @project) - if can?(current_user, :admin_project_member, @project)
%p %p
= _("You can invite a new member to <strong>%{project_name}</strong> or invite another group.").html_safe % { project_name: sanitize_project_name(@project.name) } = _("You can invite a new member to <strong>%{project_name}</strong> or invite another group.").html_safe % { project_name: sanitize(@project.name, tags: []) }
- else - else
%p %p
= _("Members can be added by project <i>Maintainers</i> or <i>Owners</i>").html_safe = _("Members can be added by project <i>Maintainers</i> or <i>Owners</i>").html_safe
......
---
title: "Fix unwanted character replacement on project members page caused by usage of sanitize function"
merge_request: 25946
author: Elias Werberich
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