diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-04-02 11:36:51 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-04-02 11:36:51 +0300 |
| commit | 5ddd4f0f0708921ca0c8a9a941cfb4c0fb868b00 (patch) | |
| tree | c8d38517a67a0dbe62212e87e17b58f9fe306bd3 | |
| parent | 1b6fe3ae226e4c6f481c90c886e242fcd96ab11b (diff) | |
| parent | 83fb62d493013973cb90b611d7c741d612ab6caf (diff) | |
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
4 files changed, 8 insertions, 3 deletions
diff --git a/app/views/projects/project_members/_groups.html.haml b/app/views/projects/project_members/_groups.html.haml index b5d397e3065..00321014f91 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 <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 %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 e0dd386fc5d..f220299ec30 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 <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 = 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/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml index 242ff91f539..8373903443e 100644 --- a/app/views/projects/project_members/index.html.haml +++ b/app/views/projects/project_members/index.html.haml @@ -6,7 +6,7 @@ = _("Project members") - if can?(current_user, :admin_project_member, @project) %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 %p = _("Members can be added by project <i>Maintainers</i> or <i>Owners</i>").html_safe 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 00000000000..a295afc5c48 --- /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 |