Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

2 files changed, 21 insertions, 8 deletions

diff --git a/spec/frontend/design_management/pages/design/__snapshots__/index_spec.js.snap b/spec/frontend/design_management/pages/design/__snapshots__/index_spec.js.snap
index 3d04840b1f8..31b3117cb6c 100644
--- a/spec/frontend/design_management/pages/design/__snapshots__/index_spec.js.snap
+++ b/spec/frontend/design_management/pages/design/__snapshots__/index_spec.js.snap
@@ -70,6 +70,13 @@ exports[`Design management design index page renders design index 1`] = `
      
     <!---->
      
+    <design-note-signed-out-stub
+      class="gl-mb-4"
+      isadddiscussion="true"
+      registerpath=""
+      signinpath=""
+    />
+     
     <design-discussion-stub
       data-testid="unresolved-discussion"
       designid="gid::/gitlab/Design/1"
@@ -77,6 +84,8 @@ exports[`Design management design index page renders design index 1`] = `
       discussionwithopenform=""
       markdownpreviewpath="/project-path/preview_markdown?target_type=Issue"
       noteableid="gid::/gitlab/Design/1"
+      registerpath=""
+      signinpath=""
     />
      
     <gl-button-stub
@@ -126,6 +135,8 @@ exports[`Design management design index page renders design index 1`] = `
         discussionwithopenform=""
         markdownpreviewpath="/project-path/preview_markdown?target_type=Issue"
         noteableid="gid::/gitlab/Design/1"
+        registerpath=""
+        signinpath=""
       />
     </gl-collapse-stub>
      
@@ -231,14 +242,14 @@ exports[`Design management design index page with error GlAlert is rendered in c
       participants="[object Object]"
     />
      
-    <h2
-      class="new-discussion-disclaimer gl-font-base gl-m-0 gl-mb-4"
-      data-testid="new-discussion-disclaimer"
-    >
-      
-    Click the image where you'd like to start a new discussion
-  
-    </h2>
+    <!---->
+     
+    <design-note-signed-out-stub
+      class="gl-mb-4"
+      isadddiscussion="true"
+      registerpath=""
+      signinpath=""
+    />
       
     <!---->
      
diff --git a/spec/frontend/design_management/pages/design/index_spec.js b/spec/frontend/design_management/pages/design/index_spec.js
index 6ce384b4869..98e2313e9f2 100644
--- a/spec/frontend/design_management/pages/design/index_spec.js
+++ b/spec/frontend/design_management/pages/design/index_spec.js
@@ -317,6 +317,8 @@ describe('Design management design index page', () => {
     describe('when no design exists for given version', () => {
       it('redirects to /designs', () => {
         createComponent({ loading: true });
+        // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+        // eslint-disable-next-line no-restricted-syntax
         wrapper.setData({
           allVersions: mockAllVersions,
         });