Add latest changes from gitlab-org/gitlab@master

2 files changed, 15 insertions, 9 deletions

diff --git a/spec/frontend/vue_shared/components/notes/__snapshots__/noteable_warning_spec.js.snap b/spec/frontend/vue_shared/components/notes/__snapshots__/noteable_warning_spec.js.snap
index 891b0c95f0e..ad0e260ad70 100644
--- a/spec/frontend/vue_shared/components/notes/__snapshots__/noteable_warning_spec.js.snap
+++ b/spec/frontend/vue_shared/components/notes/__snapshots__/noteable_warning_spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`Issue Warning Component when issue is locked but not confidential renders information about locked issue 1`] = `
 <span>
-  This issue is locked. Only project members can comment.
+  The discussion in this issue is locked. Only project members can comment.
   <gl-link-stub
     href="locked-path"
     target="_blank"
@@ -34,12 +34,12 @@ exports[`Issue Warning Component when noteable is locked and confidential render
     >
       confidential
     </gl-link-stub>
-    and
+    and its
     <gl-link-stub
       href=""
       target="_blank"
     >
-      locked
+      discussion is locked
     </gl-link-stub>
     .
   </span>
diff --git a/spec/frontend/vue_shared/components/notes/noteable_warning_spec.js b/spec/frontend/vue_shared/components/notes/noteable_warning_spec.js
index d7fcb9a25d4..d73356e00da 100644
--- a/spec/frontend/vue_shared/components/notes/noteable_warning_spec.js
+++ b/spec/frontend/vue_shared/components/notes/noteable_warning_spec.js
@@ -126,12 +126,14 @@ describe('Issue Warning Component', () => {
     });
 
     it('renders confidential & locked messages with noteable "issue"', () => {
-      expect(findLockedBlock(wrapperLocked).text()).toContain('This issue is locked.');
+      expect(findLockedBlock(wrapperLocked).text()).toContain(
+        'The discussion in this issue is locked.',
+      );
       expect(findConfidentialBlock(wrapperConfidential).text()).toContain(
         'This is a confidential issue.',
       );
       expect(findLockedAndConfidentialBlock(wrapperLockedAndConfidential).text()).toContain(
-        'This issue is confidential and locked.',
+        'This issue is confidential and its discussion is locked.',
       );
     });
 
@@ -147,7 +149,9 @@ describe('Issue Warning Component', () => {
       });
 
       await nextTick();
-      expect(findLockedBlock(wrapperLocked).text()).toContain('This epic is locked.');
+      expect(findLockedBlock(wrapperLocked).text()).toContain(
+        'The discussion in this epic is locked.',
+      );
 
       await nextTick();
       expect(findConfidentialBlock(wrapperConfidential).text()).toContain(
@@ -156,7 +160,7 @@ describe('Issue Warning Component', () => {
 
       await nextTick();
       expect(findLockedAndConfidentialBlock(wrapperLockedAndConfidential).text()).toContain(
-        'This epic is confidential and locked.',
+        'This epic is confidential and its discussion is locked.',
       );
     });
 
@@ -172,7 +176,9 @@ describe('Issue Warning Component', () => {
       });
 
       await nextTick();
-      expect(findLockedBlock(wrapperLocked).text()).toContain('This merge request is locked.');
+      expect(findLockedBlock(wrapperLocked).text()).toContain(
+        'The discussion in this merge request is locked.',
+      );
 
       await nextTick();
       expect(findConfidentialBlock(wrapperConfidential).text()).toContain(
@@ -181,7 +187,7 @@ describe('Issue Warning Component', () => {
 
       await nextTick();
       expect(findLockedAndConfidentialBlock(wrapperLockedAndConfidential).text()).toContain(
-        'This merge request is confidential and locked.',
+        'This merge request is confidential and its discussion is locked.',
       );
     });
   });