From 289b9067fb1fd8137aa8cfdf86c61745d03320cb Mon Sep 17 00:00:00 2001 From: Elias Werberich Date: Mon, 1 Apr 2019 22:00:57 +0200 Subject: [PATCH] Port of contribute/fix-project-name-members-page to EE --- app/views/projects/project_members/_groups.html.haml | 2 +- app/views/projects/project_members/_team.html.haml | 2 +- .../unreleased/58751-fix-project-name-members-page.yml | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 changelogs/unreleased/58751-fix-project-name-members-page.yml diff --git a/app/views/projects/project_members/_groups.html.haml b/app/views/projects/project_members/_groups.html.haml index b5d397e3065d54..00321014f911b6 100644 --- a/app/views/projects/project_members/_groups.html.haml +++ b/app/views/projects/project_members/_groups.html.haml @@ -1,6 +1,6 @@ .card.project-members-groups .card-header - = _("Groups with access to %{project_name}").html_safe % { project_name: sanitize_project_name(@project.name) } + = _("Groups with access to %{project_name}").html_safe % { project_name: sanitize(@project.name, tags: []) } %span.badge.badge-pill= group_links.size %ul.content-list.members-list = render partial: 'shared/members/group', collection: group_links, as: :group_link diff --git a/app/views/projects/project_members/_team.html.haml b/app/views/projects/project_members/_team.html.haml index e0dd386fc5d75a..f220299ec306fb 100644 --- a/app/views/projects/project_members/_team.html.haml +++ b/app/views/projects/project_members/_team.html.haml @@ -4,7 +4,7 @@ .card .card-header.flex-project-members-panel %span.flex-project-title - = _("Members of %{project_name}").html_safe % { project_name: sanitize_project_name(project.name) } + = _("Members of %{project_name}").html_safe % { project_name: sanitize(project.name, tags: []) } %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-group diff --git a/changelogs/unreleased/58751-fix-project-name-members-page.yml b/changelogs/unreleased/58751-fix-project-name-members-page.yml new file mode 100644 index 00000000000000..a295afc5c48e31 --- /dev/null +++ b/changelogs/unreleased/58751-fix-project-name-members-page.yml @@ -0,0 +1,5 @@ +--- +title: "Fix unwanted character replacement on project members page caused by usage of sanitize function" +merge_request: 25946 +author: Elias Werberich +type: fixed -- GitLab