From 48aff82709769b098321c738f3444b9bdaa694c6 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 21 Oct 2020 07:08:36 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-5-stable-ee

---
 app/assets/javascripts/notes/components/note_actions.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'app/assets/javascripts/notes/components/note_actions.vue')

diff --git a/app/assets/javascripts/notes/components/note_actions.vue b/app/assets/javascripts/notes/components/note_actions.vue
index a8057276f1a..c2f40b2d21a 100644
--- a/app/assets/javascripts/notes/components/note_actions.vue
+++ b/app/assets/javascripts/notes/components/note_actions.vue
@@ -160,7 +160,7 @@ export default {
       });
     },
     displayMemberBadgeText() {
-      return sprintf(__('This user is a %{access} of the %{name} project.'), {
+      return sprintf(__('This user has the %{access} role in the %{name} project.'), {
         access: this.accessLevel.toLowerCase(),
         name: this.projectName,
       });
@@ -275,7 +275,8 @@ export default {
         v-gl-tooltip
         type="button"
         title="Edit comment"
-        class="note-action-button js-note-edit btn btn-transparent qa-note-edit-button"
+        class="note-action-button js-note-edit btn btn-transparent"
+        data-qa-selector="note_edit_button"
         @click="onEdit"
       >
         <gl-icon name="pencil" class="link-highlight" />
-- 
cgit v1.2.1