Add latest changes from gitlab-org/gitlab@master

5 files changed, 11 insertions, 8 deletions

diff --git a/spec/controllers/groups/settings/ci_cd_controller_spec.rb b/spec/controllers/groups/settings/ci_cd_controller_spec.rb
index 8ba7a96e1ee..b5154f4f877 100644
--- a/spec/controllers/groups/settings/ci_cd_controller_spec.rb
+++ b/spec/controllers/groups/settings/ci_cd_controller_spec.rb
@@ -267,7 +267,7 @@ describe Groups::Settings::CiCdController do
         it 'creates the deploy token' do
           subject
 
-          expect(response).to have_gitlab_http_status(:ok)
+          expect(response).to have_gitlab_http_status(:created)
           expect(response).to match_response_schema('public_api/v4/deploy_token')
           expect(json_response).to match(expected_response)
         end
diff --git a/spec/controllers/projects/settings/ci_cd_controller_spec.rb b/spec/controllers/projects/settings/ci_cd_controller_spec.rb
index 87b40a02567..8f516de3322 100644
--- a/spec/controllers/projects/settings/ci_cd_controller_spec.rb
+++ b/spec/controllers/projects/settings/ci_cd_controller_spec.rb
@@ -300,7 +300,7 @@ describe Projects::Settings::CiCdController do
         it 'creates the deploy token' do
           subject
 
-          expect(response).to have_gitlab_http_status(:ok)
+          expect(response).to have_gitlab_http_status(:created)
           expect(response).to match_response_schema('public_api/v4/deploy_token')
           expect(json_response).to match(expected_response)
         end
diff --git a/spec/frontend/diffs/components/commit_item_spec.js b/spec/frontend/diffs/components/commit_item_spec.js
index 6bb3a0dcf21..517d050eb54 100644
--- a/spec/frontend/diffs/components/commit_item_spec.js
+++ b/spec/frontend/diffs/components/commit_item_spec.js
@@ -59,7 +59,9 @@ describe('diffs/components/commit_item', () => {
       expect(titleElement.text()).toBe(commit.title_html);
     });
 
-    it('renders commit description', () => {
+    // https://gitlab.com/gitlab-org/gitlab/-/issues/209776
+    // eslint-disable-next-line jest/no-disabled-tests
+    it.skip('renders commit description', () => {
       const descElement = getDescElement();
       const descExpandElement = getDescExpandElement();
 
diff --git a/spec/frontend/snippets/components/snippet_header_spec.js b/spec/frontend/snippets/components/snippet_header_spec.js
index 878baab9cac..1b67c08e5a4 100644
--- a/spec/frontend/snippets/components/snippet_header_spec.js
+++ b/spec/frontend/snippets/components/snippet_header_spec.js
@@ -1,7 +1,7 @@
 import SnippetHeader from '~/snippets/components/snippet_header.vue';
 import DeleteSnippetMutation from '~/snippets/mutations/deleteSnippet.mutation.graphql';
 import { ApolloMutation } from 'vue-apollo';
-import { GlDeprecatedButton, GlModal } from '@gitlab/ui';
+import { GlNewButton, GlModal } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 
 describe('Snippet header component', () => {
@@ -89,7 +89,7 @@ describe('Snippet header component', () => {
         updateSnippet: false,
       },
     });
-    expect(wrapper.findAll(GlDeprecatedButton).length).toEqual(0);
+    expect(wrapper.findAll(GlNewButton).length).toEqual(0);
 
     createComponent({
       permissions: {
@@ -97,7 +97,7 @@ describe('Snippet header component', () => {
         updateSnippet: false,
       },
     });
-    expect(wrapper.findAll(GlDeprecatedButton).length).toEqual(1);
+    expect(wrapper.findAll(GlNewButton).length).toEqual(1);
 
     createComponent({
       permissions: {
@@ -105,7 +105,7 @@ describe('Snippet header component', () => {
         updateSnippet: true,
       },
     });
-    expect(wrapper.findAll(GlDeprecatedButton).length).toEqual(2);
+    expect(wrapper.findAll(GlNewButton).length).toEqual(2);
 
     createComponent({
       permissions: {
@@ -117,7 +117,7 @@ describe('Snippet header component', () => {
       canCreateSnippet: true,
     });
     return wrapper.vm.$nextTick().then(() => {
-      expect(wrapper.findAll(GlDeprecatedButton).length).toEqual(3);
+      expect(wrapper.findAll(GlNewButton).length).toEqual(3);
     });
   });
 
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index 7190d84573e..653b011084e 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -845,6 +845,7 @@ Epic:
   - due_date_sourcing_epic_id
   - health_status
   - external_key
+  - confidential
 EpicIssue:
   - id
   - relative_position