From 67370c8b72013a75705265605517a40daf69fc33 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 25 Aug 2020 12:04:30 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap | 2 +-
 spec/frontend/snippets/components/edit_spec.js                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'spec/frontend')

diff --git a/spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap b/spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap
index 3881b2d7679..b80b7fdb43e 100644
--- a/spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap
+++ b/spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap
@@ -111,7 +111,7 @@ exports[`Design management index page designs renders designs list and header wi
       >
         <gl-button-stub
           category="primary"
-          class="gl-mr-3 js-select-all"
+          class="gl-mr-4 js-select-all"
           icon=""
           size="small"
           variant="link"
diff --git a/spec/frontend/snippets/components/edit_spec.js b/spec/frontend/snippets/components/edit_spec.js
index 57142da0557..648285bd2f1 100644
--- a/spec/frontend/snippets/components/edit_spec.js
+++ b/spec/frontend/snippets/components/edit_spec.js
@@ -200,7 +200,7 @@ describe('Snippet Edit app', () => {
 
     it.each`
       projectPath       | snippetArg               | expectation
-      ${''}             | ${[]}                    | ${`${relativeUrlRoot}-/snippets`}
+      ${''}             | ${[]}                    | ${`${relativeUrlRoot}/-/snippets`}
       ${'project/path'} | ${[]}                    | ${`${relativeUrlRoot}project/path/-/snippets`}
       ${''}             | ${[createTestSnippet()]} | ${TEST_WEB_URL}
       ${'project/path'} | ${[createTestSnippet()]} | ${TEST_WEB_URL}
-- 
cgit v1.2.1