Automatic merge of gitlab-org/gitlab master

app/assets/javascripts/repository/components/fork_suggestion.vue

+<script>
+import { GlButton } from '@gitlab/ui';
+import { __ } from '~/locale';
+
+export default {
+  i18n: {
+    message: __(
+      'You can’t edit files directly in this project. Fork this project and submit a merge request with your changes.',
+    ),
+    fork: __('Fork'),
+    cancel: __('Cancel'),
+  },
+  components: {
+    GlButton,
+  },
+  props: {
+    forkPath: {
+      type: String,
+      required: true,
+    },
+  },
+};
+</script>
+
+<template>
+  <div
+    class="gl-display-flex gl-justify-content-end gl-align-items-center gl-bg-gray-10 gl-px-5 gl-py-2 gl-border-1 gl-border-b-solid gl-border-gray-100"
+  >
+    <span class="gl-mr-6" data-testid="message">{{ $options.i18n.message }}</span>
+
+    <gl-button
+      class="gl-mr-3"
+      category="secondary"
+      variant="confirm"
+      :href="forkPath"
+      data-testid="fork"
+    >
+      {{ $options.i18n.fork }}
+    </gl-button>
+
+    <gl-button data-testid="cancel" @click="$emit('cancel')">
+      {{ $options.i18n.cancel }}
+    </gl-button>
+  </div>
+</template>

app/assets/javascripts/vue_shared/security_reports/store/modules/sast/actions.js

+import { REPORT_TYPE_SAST } from '~/vue_shared/security_reports/constants';
 import { fetchDiffData } from '../../utils';
 import * as types from './mutation_types';
 
@@ -14,7 +15,7 @@ export const receiveDiffError = ({ commit }, response) =>
 export const fetchDiff = ({ state, rootState, dispatch }) => {
   dispatch('requestDiff');
 
-  return fetchDiffData(rootState, state.paths.diffEndpoint, 'sast')
+  return fetchDiffData(rootState, state.paths.diffEndpoint, REPORT_TYPE_SAST)
     .then((data) => {
       dispatch('receiveDiffSuccess', data);
     })

app/assets/javascripts/vue_shared/security_reports/store/modules/secret_detection/actions.js

+import { REPORT_TYPE_SECRET_DETECTION } from '~/vue_shared/security_reports/constants';
 import { fetchDiffData } from '../../utils';
 import * as types from './mutation_types';
 
@@ -14,7 +15,7 @@ export const receiveDiffError = ({ commit }, response) =>
 export const fetchDiff = ({ state, rootState, dispatch }) => {
   dispatch('requestDiff');
 
-  return fetchDiffData(rootState, state.paths.diffEndpoint, 'secret_detection')
+  return fetchDiffData(rootState, state.paths.diffEndpoint, REPORT_TYPE_SECRET_DETECTION)
     .then((data) => {
       dispatch('receiveDiffSuccess', data);
     })

config/feature_flags/development/infinitely_collapsible_sections.yml

@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335297
 milestone: '14.1'
 type: development
 group: group::pipeline execution
-default_enabled: true
+default_enabled: false

config/feature_flags/development/usage_data_i_testing_test_case_parsed.yml

----
-name: usage_data_i_testing_test_case_parsed
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41918
-rollout_issue_url: 
-milestone: '13.5'
-type: development
-group: group::testing
-default_enabled: true

doc/api/group_import_export.md

@@ -57,8 +57,12 @@ GET /groups/:id/export/download
 | `id`      | integer/string | yes      | ID of the group owned by the authenticated user |
 
 ```shell
-curl --header "PRIVATE-TOKEN: <your_access_token>" --remote-header-name \
-     --remote-name "https://gitlab.example.com/api/v4/groups/1/export/download"
+group=1
+token=secret
+curl --request GET\
+     --header "PRIVATE-TOKEN: ${token}" \
+     --output download_group_${group}.tar.gz \
+     "https://gitlab.example.com/api/v4/groups/${group}/export/download"
 ```
 
 ```shell

doc/user/project/quick_actions.md

@@ -103,7 +103,7 @@ threads. Some quick actions might not be available to all subscription tiers.
 | `/target_branch <local branch name>`  | **{dotted-circle}** No | **{check-circle}** Yes | **{dotted-circle}** No | Set target branch. |
 | `/title <new title>`                  | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | Change title. |
 | `/todo`                               | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | Add a to-do item. |
-| `/unapprove`                          | **{dotted-circle}** No | **{check-circle}** Yes | **{dotted-circle}** No | Unapprove the merge request. ([introduced in GitLab 14.3](https://gitlab.com/gitlab-org/gitlab/-/issues/8003)|
+| `/unapprove`                          | **{dotted-circle}** No | **{check-circle}** Yes | **{dotted-circle}** No | Unapprove the merge request. ([introduced in GitLab 14.3](https://gitlab.com/gitlab-org/gitlab/-/issues/8103)|
 | `/unassign @user1 @user2`             | **{check-circle}** Yes | **{check-circle}** Yes | **{dotted-circle}** No | Remove specific assignees. |
 | `/unassign`                           | **{dotted-circle}** No | **{check-circle}** Yes | **{dotted-circle}** No | Remove all assignees. |
 | `/unassign_reviewer @user1 @user2` or `/remove_reviewer @user1 @user2`    | **{dotted-circle}** No | **{check-circle}** Yes | **{dotted-circle}** No | Remove specific reviewers. |

lib/gitlab/usage_data_counters/known_events/common.yml

@@ -149,7 +149,6 @@
   category: testing
   redis_slot: testing
   aggregation: weekly
-  feature_flag: usage_data_i_testing_test_case_parsed
 - name: i_testing_metrics_report_widget_total
   category: testing
   redis_slot: testing

locale/gitlab.pot

@@ -38770,6 +38770,9 @@ msgstr ""
 msgid "You can’t %{tag_start}edit%{tag_end} files directly in this project. Fork this project and submit a merge request with your changes."
 msgstr ""
 
+msgid "You can’t edit files directly in this project. Fork this project and submit a merge request with your changes."
+msgstr ""
+
 msgid "You could not create a new trigger."
 msgstr ""
 

spec/frontend/repository/components/fork_suggestion_spec.js

+import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
+import ForkSuggestion from '~/repository/components/fork_suggestion.vue';
+
+const DEFAULT_PROPS = { forkPath: 'some_file.js/fork' };
+
+describe('ForkSuggestion component', () => {
+  let wrapper;
+
+  const createComponent = () => {
+    wrapper = shallowMountExtended(ForkSuggestion, {
+      propsData: { ...DEFAULT_PROPS },
+    });
+  };
+
+  beforeEach(() => createComponent());
+
+  afterEach(() => wrapper.destroy());
+
+  const { i18n } = ForkSuggestion;
+  const findMessage = () => wrapper.findByTestId('message');
+  const findForkButton = () => wrapper.findByTestId('fork');
+  const findCancelButton = () => wrapper.findByTestId('cancel');
+
+  it('renders a message', () => {
+    expect(findMessage().text()).toBe(i18n.message);
+  });
+
+  it('renders a Fork button', () => {
+    const forkButton = findForkButton();
+
+    expect(forkButton.text()).toBe(i18n.fork);
+    expect(forkButton.attributes('href')).toBe(DEFAULT_PROPS.forkPath);
+  });
+
+  it('renders a Cancel button', () => {
+    expect(findCancelButton().text()).toBe(i18n.cancel);
+  });
+
+  it('emits a cancel event when Cancel button is clicked', () => {
+    findCancelButton().vm.$emit('click');
+
+    expect(wrapper.emitted('cancel')).toEqual([[]]);
+  });
+});