Add latest changes from gitlab-org/gitlab@master

0ba3a054 · GitLab Bot · b24ae1cb · 0ba3a054 · 0ba3a054 · 0ba3a054
Commit 0ba3a054 authored Jan 10, 2020 by GitLab Bot
206 changed files
--- a/app/assets/javascripts/ide/stores/actions/file.js
+++ b/app/assets/javascripts/ide/stores/actions/file.js
@@ -197,6 +197,7 @@ export const discardFileChanges = ({ dispatch, state, commit, getters }, path) =
    if (file.tempFile) {
      dispatch('deleteEntry', file.path);
    } else {
+      commit(types.DISCARD_FILE_CHANGES, file.path);
      dispatch('renameEntry', {
        path: file.path,
        name: file.prevName,

--- a/app/assets/javascripts/ide/stores/mutations/file.js
+++ b/app/assets/javascripts/ide/stores/mutations/file.js
@@ -132,7 +132,7 @@ export default {
  [types.DISCARD_FILE_CHANGES](state, path) {
    const stagedFile = state.stagedFiles.find(f => f.path === path);
    const entry = state.entries[path];
-    const { deleted, prevPath } = entry;
+    const { deleted } = entry;

    Object.assign(state.entries[path], {
      content: stagedFile ? stagedFile.content : state.entries[path].raw,
@@ -146,12 +146,6 @@ export default {
        : state.trees[`${state.currentProjectId}/${state.currentBranchId}`];

      parent.tree = sortTree(parent.tree.concat(entry));
-    } else if (prevPath) {
-      const parent = entry.parentPath
-        ? state.entries[entry.parentPath]
-        : state.trees[`${state.currentProjectId}/${state.currentBranchId}`];
-
-      parent.tree = parent.tree.filter(f => f.path !== path);
    }
  },
  [types.ADD_FILE_TO_CHANGED](state, path) {

--- a/changelogs/unreleased/31859-fix-discarding-renamed-entry-with-changes.yml
+++ b/changelogs/unreleased/31859-fix-discarding-renamed-entry-with-changes.yml
+---
+title: Update IDE discard of renamed entry to also discard file changes
+merge_request: 22573
+author:
+type: fixed
--- a/changelogs/unreleased/cluster-applications-0-4-0.yml
+++ b/changelogs/unreleased/cluster-applications-0-4-0.yml
+---
+title: Bump cluster-applications image to v0.4.0, adding support to install cert-manager
+merge_request: 22657
+author:
+type: changed
--- a/doc/ci/variables/predefined_variables.md
+++ b/doc/ci/variables/predefined_variables.md
@@ -86,7 +86,7 @@ future GitLab releases.**
 | `CI_PAGES_URL`                                | 11.8   | all    | URL to GitLab Pages-built pages. Always belongs to a subdomain of `CI_PAGES_DOMAIN`.                                                                                                                                                                                                                                                                       |
 | `CI_PIPELINE_ID`                              | 8.10   | all    | The unique id of the current pipeline that GitLab CI uses internally                                                                                                                                                                                                                                                                                       |
 | `CI_PIPELINE_IID`                             | 11.0   | all    | The unique id of the current pipeline scoped to project                                                                                                                                                                                                                                                                                                    |
-| `CI_PIPELINE_SOURCE`                          | 10.0   | all    | Indicates how the pipeline was triggered. Possible options are: `push`, `web`, `trigger`, `schedule`, `api`, `pipeline` and `merge_request_event`. For pipelines created before GitLab 9.5, this will show as `unknown`                                                                                                                                                          |
+| `CI_PIPELINE_SOURCE`                          | 10.0   | all    | Indicates how the pipeline was triggered. Possible options are: `push`, `web`, `trigger`, `schedule`, `api`, `pipeline`, `external`, `chat`, `merge_request_event`, and `external_pull_request_event`. For pipelines created before GitLab 9.5, this will show as `unknown`                                                                                                                                                          |
 | `CI_PIPELINE_TRIGGERED`                       | all    | all    | The flag to indicate that job was [triggered](../triggers/README.md)                                                                                                                                                                                                                                                                                       |
 | `CI_PIPELINE_URL`                             | 11.1   | 0.5    | Pipeline details URL                                                                                                                                                                                                                                                                                                                                       |
 | `CI_PROJECT_DIR`                              | all    | all    | The full path where the repository is cloned and where the job is run. If the GitLab Runner `builds_dir` parameter is set, this variable is set relative to the value of `builds_dir`. For more information, see [Advanced configuration](https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section) for GitLab Runner. |

--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -729,7 +729,18 @@ Learn more about [variables expressions](../variables/README.md#environment-vari
 Using the `changes` keyword with `only` or `except` makes it possible to define if
 a job should be created based on files modified by a Git push event.

-For example:
+This means the `only:changes` policy is useful for pipelines where:
+
+- `$CI_PIPELINE_SOURCE == 'push'`
+- `$CI_PIPELINE_SOURCE == 'merge_request_event'`
+- `$CI_PIPELINE_SOURCE == 'external_pull_request_event'`
+
+If there is no Git push event, such as for pipelines with
+[sources other than the three above](../variables/predefined_variables.html#variables-reference),
+`changes` cannot determine if a given file is new or old, and will always
+return true.
+
+A basic example of using `only: changes`:

 ```yaml
 docker build:
@@ -910,8 +921,9 @@ at all, the behavior defaults to `job:when`, which continues to default to

 #### `rules:changes`

-`changes` works exactly the same way as [`only`/`except`](#onlychangesexceptchanges),
-accepting an array of paths.
+`rules: changes` works exactly the same way as `only: changes` and `except: changes`,
+accepting an array of paths. Similarly, it will always return true if there is no
+Git push event. See [`only/except: changes`](#onlychangesexceptchanges) for more information.

 For example:


--- a/doc/user/clusters/applications.md
+++ b/doc/user/clusters/applications.md
@@ -35,7 +35,7 @@ The following applications can be installed:

 - [Helm](#helm)
 - [Ingress](#ingress)
- [Cert-Manager](#cert-manager)
+- [cert-manager](#cert-manager)
 - [Prometheus](#prometheus)
 - [GitLab Runner](#gitlab-runner)
 - [JupyterHub](#jupyterhub)
@@ -73,13 +73,13 @@ Installing Helm as a GitLab-managed App behind a proxy is not supported,
 but a [workaround](../../topics/autodevops/index.md#installing-helm-behind-a-proxy)
 is available.

-### Cert-Manager
+### cert-manager

 > Introduced in GitLab 11.6 for project- and group-level clusters.

-[Cert-Manager](https://docs.cert-manager.io/en/latest/) is a native
+[cert-manager](https://docs.cert-manager.io/en/latest/) is a native
 Kubernetes certificate management controller that helps with issuing
-certificates. Installing Cert-Manager on your cluster will issue a
+certificates. Installing cert-manager on your cluster will issue a
 certificate by [Let's Encrypt](https://letsencrypt.org/) and ensure that
 certificates are valid and up-to-date.

@@ -91,13 +91,13 @@ The chart used to install this application depends on the version of GitLab used
 - GitLab 12.2 and older, the [stable/cert-manager](https://github.com/helm/charts/tree/master/stable/cert-manager)
  chart was used.

-If you have installed Cert-Manager prior to GitLab 12.3, Let's Encrypt will
-[block requests from older versions of Cert-Manager](https://community.letsencrypt.org/t/blocking-old-cert-manager-versions/98753).
+If you have installed cert-manager prior to GitLab 12.3, Let's Encrypt will
+[block requests from older versions of cert-manager](https://community.letsencrypt.org/t/blocking-old-cert-manager-versions/98753).

 To resolve this:

-1. Uninstall Cert-Manager (consider [backing up any additional configuration](https://docs.cert-manager.io/en/latest/tasks/backup-restore-crds.html)).
-1. Install Cert-Manager again.
+1. Uninstall cert-manager (consider [backing up any additional configuration](https://docs.cert-manager.io/en/latest/tasks/backup-restore-crds.html)).
+1. Install cert-manager again.

 ### GitLab Runner

@@ -446,6 +446,7 @@ install using Helm `values.yaml` files.
 Supported applications:

 - [Ingress](#install-ingress-using-gitlab-ci)
+- [cert-manager](#install-cert-manager-using-gitlab-ci)
 - [Sentry](#install-sentry-using-gitlab-ci)

 ### Usage
@@ -499,6 +500,43 @@ management project. Refer to the
 [chart](https://github.com/helm/charts/tree/master/stable/nginx-ingress)
 for the available configuration options.

+### Install cert-manager using GitLab CI
+
+cert-manager is installed using GitLab CI by defining configuration in
+`.gitlab/managed-apps/config.yaml`.
+
+cert-manager:
+
+- Is installed into the `gitlab-managed-apps` namespace of your cluster.
+- Can be installed with or without a default [Let's Encrypt `ClusterIssuer`](https://cert-manager.io/docs/configuration/acme/), which requires an
+  email address to be specified. The email address is used by Let's Encrypt to
+  contact you about expiring certificates and issues related to your account.
+
+The following configuration is required to install cert-manager using GitLab CI:
+
+```yaml
+certManager:
+  installed: true
+  letsEncryptClusterIssuer:
+    installed: true
+    email: "user@example.com"
+```
+
+The following installs cert-manager using GitLab CI without the default `ClusterIssuer`:
+
+```yaml
+certManager:
+  installed: true
+  letsEncryptClusterIssuer:
+    installed: false
+```
+
+You can customize the installation of Ingress by defining
+`.gitlab/managed-apps/cert-manager/values.yaml` file in your cluster
+management project. Refer to the
+[chart](https://hub.helm.sh/charts/jetstack/cert-manager) for the
+available configuration options.
+
 ### Install Sentry using GitLab CI

 NOTE: **Note:**
@@ -593,7 +631,7 @@ The applications below can be uninstalled.

 | Application | GitLab version | Notes |
 | ----------- | -------------- | ----- |
-| Cert-Manager | 12.2+         | The associated private key will be deleted and cannot be restored. Deployed applications will continue to use HTTPS, but certificates will not be renewed. Before uninstalling, you may wish to [back up your configuration](https://docs.cert-manager.io/en/latest/tasks/backup-restore-crds.html) or [revoke your certificates](https://letsencrypt.org/docs/revoking/). |
+| cert-manager | 12.2+         | The associated private key will be deleted and cannot be restored. Deployed applications will continue to use HTTPS, but certificates will not be renewed. Before uninstalling, you may wish to [back up your configuration](https://docs.cert-manager.io/en/latest/tasks/backup-restore-crds.html) or [revoke your certificates](https://letsencrypt.org/docs/revoking/). |
 | GitLab Runner  | 12.2+         | Any running pipelines will be canceled. |
 | Helm  | 12.2+         | The associated Tiller pod, the `gitlab-managed-apps` namespace, and all of its resources will be deleted and cannot be restored. |
 | Ingress  | 12.1+         | The associated load balancer and IP will be deleted and cannot be restored. Furthermore, it can only be uninstalled if JupyterHub is not installed. |

--- a/lib/gitlab/ci/templates/Managed-Cluster-Applications.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Managed-Cluster-Applications.gitlab-ci.yml
 apply:
  stage: deploy
-  image: "registry.gitlab.com/gitlab-org/cluster-integration/cluster-applications:v0.3.0"
+  image: "registry.gitlab.com/gitlab-org/cluster-integration/cluster-applications:v0.4.0"
  environment:
    name: production
  variables:
@@ -9,7 +9,6 @@ apply:
    INGRESS_VALUES_FILE: $CI_PROJECT_DIR/.gitlab/managed-apps/ingress/values.yaml
    SENTRY_VALUES_FILE: $CI_PROJECT_DIR/.gitlab/managed-apps/sentry/values.yaml
  script:
-    - kubectl get namespace "$TILLER_NAMESPACE" || kubectl create namespace "$TILLER_NAMESPACE"
    - gitlab-managed-apps /usr/local/share/gitlab-managed-apps/helmfile.yaml
  only:
    refs:

--- a/spec/frontend/admin/statistics_panel/components/app_spec.js
+++ b/spec/frontend/admin/statistics_panel/components/app_spec.js
@@ -21,7 +21,6 @@ describe('Admin statistics app', () => {
    wrapper = shallowMount(StatisticsPanelApp, {
      localVue,
      store,
-      sync: false,
    });
  };


--- a/spec/frontend/boards/components/issue_time_estimate_spec.js
+++ b/spec/frontend/boards/components/issue_time_estimate_spec.js
@@ -20,7 +20,6 @@ describe('Issue Time Estimate component', () => {
        propsData: {
          estimate: 374460,
        },
-        sync: false,
      });
    });

@@ -61,7 +60,6 @@ describe('Issue Time Estimate component', () => {
        propsData: {
          estimate: 374460,
        },
-        sync: false,
      });
    });


--- a/spec/frontend/boards/issue_card_spec.js
+++ b/spec/frontend/boards/issue_card_spec.js
@@ -50,7 +50,6 @@ describe('Issue card component', () => {
        rootPath: '/',
      },
      store,
-      sync: false,
      attachToDocument: true,
    });
  });

--- a/spec/frontend/clusters/components/remove_cluster_confirmation_spec.js
+++ b/spec/frontend/clusters/components/remove_cluster_confirmation_spec.js
@@ -13,7 +13,6 @@ describe('Remove cluster confirmation modal', () => {
        clusterName: 'clusterName',
        ...props,
      },
-      sync: false,
    });
  };


--- a/spec/frontend/commit/commit_pipeline_status_component_spec.js
+++ b/spec/frontend/commit/commit_pipeline_status_component_spec.js
@@ -33,7 +33,6 @@ describe('Commit pipeline status component', () => {
        ...defaultProps,
        ...props,
      },
-      sync: false,
    });
  };


--- a/spec/frontend/create_cluster/gke_cluster/components/gke_machine_type_dropdown_spec.js
+++ b/spec/frontend/create_cluster/gke_cluster/components/gke_machine_type_dropdown_spec.js
@@ -28,7 +28,6 @@ const createComponent = (store, propsData = componentConfig) =>
    propsData,
    store,
    localVue,
-    sync: false,
  });

 const createStore = (initialState = {}, getters = {}) =>

--- a/spec/frontend/cycle_analytics/limit_warning_component_spec.js
+++ b/spec/frontend/cycle_analytics/limit_warning_component_spec.js
@@ -10,7 +10,6 @@ const createComponent = props =>
    propsData: {
      ...props,
    },
-    sync: false,
    attachToDocument: true,
  });


--- a/spec/frontend/diffs/components/compare_versions_spec.js
+++ b/spec/frontend/diffs/components/compare_versions_spec.js
@@ -22,7 +22,6 @@ describe('CompareVersions', () => {
    store.state.diffs.diffFiles.push('test');

    wrapper = mount(CompareVersionsComponent, {
-      sync: false,
      attachToDocument: true,
      localVue,
      store,

--- a/spec/frontend/diffs/components/diff_content_spec.js
+++ b/spec/frontend/diffs/components/diff_content_spec.js
@@ -84,7 +84,6 @@ describe('DiffContent', () => {
      },
      localVue,
      store: fakeStore,
-      sync: false,
    });
  };


--- a/spec/frontend/diffs/components/diff_discussion_reply_spec.js
+++ b/spec/frontend/diffs/components/diff_discussion_reply_spec.js
@@ -16,7 +16,6 @@ describe('DiffDiscussionReply', () => {
    wrapper = shallowMount(DiffDiscussionReply, {
      store,
      localVue,
-      sync: false,
      propsData: {
        ...props,
      },

--- a/spec/frontend/diffs/components/diff_file_header_spec.js
+++ b/spec/frontend/diffs/components/diff_file_header_spec.js
@@ -91,7 +91,6 @@ describe('DiffFileHeader component', () => {
      },
      localVue,
      store,
-      sync: false,
      attachToDocument: true,
    });
  };

--- a/spec/frontend/diffs/components/diff_gutter_avatars_spec.js
+++ b/spec/frontend/diffs/components/diff_gutter_avatars_spec.js
@@ -16,7 +16,6 @@ describe('DiffGutterAvatars', () => {
      propsData: {
        ...props,
      },
-      sync: false,
      attachToDocument: true,
    });
  };

--- a/spec/frontend/diffs/components/edit_button_spec.js
+++ b/spec/frontend/diffs/components/edit_button_spec.js
@@ -9,7 +9,6 @@ describe('EditButton', () => {
  const createComponent = (props = {}) => {
    wrapper = shallowMount(EditButton, {
      propsData: { ...props },
-      sync: false,
      attachToDocument: true,
    });
  };

--- a/spec/frontend/diffs/components/hidden_files_warning_spec.js
+++ b/spec/frontend/diffs/components/hidden_files_warning_spec.js
@@ -13,7 +13,6 @@ describe('HiddenFilesWarning', () => {

  const createComponent = () => {
    wrapper = shallowMount(HiddenFilesWarning, {
-      sync: false,
      propsData,
    });
  };

--- a/spec/frontend/diffs/components/settings_dropdown_spec.js
+++ b/spec/frontend/diffs/components/settings_dropdown_spec.js
@@ -28,7 +28,6 @@ describe('Diff settiings dropdown component', () => {
    vm = mount(SettingsDropdown, {
      localVue,
      store,
-      sync: false,
    });
  }


--- a/spec/frontend/environments/environment_monitoring_spec.js
+++ b/spec/frontend/environments/environment_monitoring_spec.js
@@ -9,7 +9,6 @@ describe('Monitoring Component', () => {

  const createWrapper = () => {
    wrapper = shallowMount(MonitoringComponent, {
-      sync: false,
      attachToDocument: true,
      propsData: {
        monitoringUrl,

--- a/spec/frontend/environments/environment_rollback_spec.js
+++ b/spec/frontend/environments/environment_rollback_spec.js
@@ -14,7 +14,6 @@ describe('Rollback Component', () => {
        environment: {},
      },
      attachToDocument: true,
-      sync: false,
    });

    expect(wrapper.element).toHaveSpriteIcon('repeat');
@@ -28,7 +27,6 @@ describe('Rollback Component', () => {
        environment: {},
      },
      attachToDocument: true,
-      sync: false,
    });

    expect(wrapper.element).toHaveSpriteIcon('redo');

--- a/spec/frontend/environments/environment_stop_spec.js
+++ b/spec/frontend/environments/environment_stop_spec.js
@@ -11,7 +11,6 @@ describe('Stop Component', () => {

  const createWrapper = () => {
    wrapper = shallowMount(StopComponent, {
-      sync: false,
      attachToDocument: true,
      propsData: {
        environment: {},

--- a/spec/frontend/environments/environment_terminal_button_spec.js
+++ b/spec/frontend/environments/environment_terminal_button_spec.js
@@ -7,7 +7,6 @@ describe('Stop Component', () => {

  const mountWithProps = props => {
    wrapper = shallowMount(TerminalComponent, {
-      sync: false,
      attachToDocument: true,
      propsData: props,
    });

--- a/spec/frontend/error_tracking/components/error_tracking_list_spec.js
+++ b/spec/frontend/error_tracking/components/error_tracking_list_spec.js
@@ -29,7 +29,6 @@ describe('ErrorTrackingList', () => {
    wrapper = mount(ErrorTrackingList, {
      localVue,
      store,
-      sync: false,
      propsData: {
        indexPath: '/path',
        enableErrorTrackingLink: '/link',

--- a/spec/frontend/frequent_items/components/frequent_items_search_input_spec.js
+++ b/spec/frontend/frequent_items/components/frequent_items_search_input_spec.js
@@ -5,7 +5,6 @@ import eventHub from '~/frequent_items/event_hub';
 const createComponent = (namespace = 'projects') =>
  shallowMount(searchComponent, {
    propsData: { namespace },
-    sync: false,
  });

 describe('FrequentItemsSearchInputComponent', () => {

--- a/spec/frontend/ide/components/branches/search_list_spec.js
+++ b/spec/frontend/ide/components/branches/search_list_spec.js
@@ -33,7 +33,6 @@ describe('IDE branches search list', () => {
    wrapper = shallowMount(List, {
      localVue,
      store: fakeStore,
-      sync: false,
    });
  };


--- a/spec/frontend/ide/components/commit_sidebar/editor_header_spec.js
+++ b/spec/frontend/ide/components/commit_sidebar/editor_header_spec.js
@@ -23,7 +23,6 @@ describe('IDE commit editor header', () => {
    wrapper = mount(EditorHeader, {
      store,
      localVue,
-      sync: false,
      propsData: {
        activeFile: f,
      },

--- a/spec/frontend/ide/components/error_message_spec.js
+++ b/spec/frontend/ide/components/error_message_spec.js
@@ -26,7 +26,6 @@ describe('IDE error message component', () => {
      },
      store: fakeStore,
      localVue,
-      sync: false,
    });
  };


--- a/spec/frontend/ide/components/file_templates/dropdown_spec.js
+++ b/spec/frontend/ide/components/file_templates/dropdown_spec.js
@@ -45,7 +45,6 @@ describe('IDE file templates dropdown component', () => {
      },
      store: fakeStore,
      localVue,
-      sync: false,
    });

    ({ element } = wrapper);

--- a/spec/frontend/ide/components/ide_status_list_spec.js
+++ b/spec/frontend/ide/components/ide_status_list_spec.js
@@ -27,7 +27,6 @@ describe('ide/components/ide_status_list', () => {

    wrapper = shallowMount(IdeStatusList, {
      localVue,
-      sync: false,
      store,
      ...options,
    });

--- a/spec/frontend/ide/components/jobs/list_spec.js
+++ b/spec/frontend/ide/components/jobs/list_spec.js
@@ -44,7 +44,6 @@ describe('IDE stages list', () => {
      },
      localVue,
      store,
-      sync: false,
    });
  };

@@ -93,7 +92,6 @@ describe('IDE stages list', () => {
      wrapper = mount(StageList, {
        propsData: { ...defaultProps, stages },
        store,
-        sync: false,
        localVue,
      });
    });

--- a/spec/frontend/ide/components/jobs/stage_spec.js
+++ b/spec/frontend/ide/components/jobs/stage_spec.js
@@ -26,7 +26,6 @@ describe('IDE pipeline stage', () => {
        ...defaultProps,
        ...props,
      },
-      sync: false,
    });
  };


--- a/spec/frontend/ide/components/merge_requests/list_spec.js
+++ b/spec/frontend/ide/components/merge_requests/list_spec.js
@@ -42,7 +42,6 @@ describe('IDE merge requests list', () => {
    wrapper = shallowMount(List, {
      store: fakeStore,
      localVue,
-      sync: false,
    });
  };


--- a/spec/frontend/ide/components/pipelines/list_spec.js
+++ b/spec/frontend/ide/components/pipelines/list_spec.js
@@ -63,7 +63,6 @@ describe('IDE pipelines list', () => {
    wrapper = shallowMount(List, {
      localVue,
      store: fakeStore,
-      sync: false,
    });
  };


--- a/spec/frontend/ide/components/preview/clientside_spec.js
+++ b/spec/frontend/ide/components/preview/clientside_spec.js
@@ -54,7 +54,6 @@ describe('IDE clientside preview', () => {
    });

    wrapper = shallowMount(Clientside, {
-      sync: false,
      store,
      localVue,
    });

--- a/spec/frontend/ide/stores/actions/file_spec.js
+++ b/spec/frontend/ide/stores/actions/file_spec.js
@@ -9,6 +9,7 @@ import router from '~/ide/ide_router';
 import eventHub from '~/ide/eventhub';
 import { file } from '../../helpers';

+const ORIGINAL_CONTENT = 'original content';
 const RELATIVE_URL_ROOT = '/gitlab';

 describe('IDE store file actions', () => {
@@ -583,6 +584,7 @@ describe('IDE store file actions', () => {

      tmpFile = file('tempFile');
      tmpFile.content = 'testing';
+      tmpFile.raw = ORIGINAL_CONTENT;

      store.state.changedFiles.push(tmpFile);
      store.state.entries[tmpFile.path] = tmpFile;
@@ -594,7 +596,7 @@ describe('IDE store file actions', () => {
      store
        .dispatch('discardFileChanges', tmpFile.path)
        .then(() => {
-          expect(tmpFile.content).not.toBe('testing');
+          expect(tmpFile.content).toBe(ORIGINAL_CONTENT);

          done();
        })
@@ -624,22 +626,30 @@ describe('IDE store file actions', () => {
      expect(store.dispatch).toHaveBeenCalledWith('deleteEntry', tmpFile.path);
    });

-    it('renames the file to its original name and closes it if it was open', () => {
-      Object.assign(tmpFile, {
-        prevPath: 'parentPath/old_name',
-        prevName: 'old_name',
-        prevParentPath: 'parentPath',
-      });
+    describe('with renamed file', () => {
+      beforeEach(() => {
+        Object.assign(tmpFile, {
+          prevPath: 'parentPath/old_name',
+          prevName: 'old_name',
+          prevParentPath: 'parentPath',
+        });

-      store.state.entries.parentPath = file('parentPath');
+        store.state.entries.parentPath = file('parentPath');

-      actions.discardFileChanges(store, tmpFile.path);
+        actions.discardFileChanges(store, tmpFile.path);
+      });

-      expect(store.dispatch).toHaveBeenCalledWith('closeFile', tmpFile);
-      expect(store.dispatch).toHaveBeenCalledWith('renameEntry', {
-        path: 'tempFile',
-        name: 'old_name',
-        parentPath: 'parentPath',
+      it('renames the file to its original name and closes it if it was open', () => {
+        expect(store.dispatch).toHaveBeenCalledWith('closeFile', tmpFile);
+        expect(store.dispatch).toHaveBeenCalledWith('renameEntry', {
+          path: 'tempFile',
+          name: 'old_name',
+          parentPath: 'parentPath',
+        });
+      });
+
+      it('resets file content', () => {
+        expect(tmpFile.content).toBe(ORIGINAL_CONTENT);
      });
    });


--- a/spec/frontend/import_projects/components/import_projects_table_spec.js
+++ b/spec/frontend/import_projects/components/import_projects_table_spec.js
@@ -45,7 +45,6 @@ describe('ImportProjectsTable', () => {
      propsData: {
        providerTitle,
      },
-      sync: false,
    });

    return component.vm;

--- a/spec/frontend/import_projects/components/imported_project_table_row_spec.js
+++ b/spec/frontend/import_projects/components/imported_project_table_row_spec.js
@@ -26,7 +26,6 @@ describe('ImportedProjectTableRow', () => {
          ...project,
        },
      },
-      sync: false,
    });

    return component.vm;

--- a/spec/frontend/import_projects/components/provider_repo_table_row_spec.js
+++ b/spec/frontend/import_projects/components/provider_repo_table_row_spec.js
@@ -45,7 +45,6 @@ describe('ProviderRepoTableRow', () => {
      propsData: {
        repo,
      },
-      sync: false,
    });

    return component.vm;

--- a/spec/frontend/issuable_suggestions/components/app_spec.js
+++ b/spec/frontend/issuable_suggestions/components/app_spec.js
@@ -11,7 +11,6 @@ describe('Issuable suggestions app component', () => {
        search,
        projectPath: 'project',
      },
-      sync: false,
      attachToDocument: true,
    });
  }

--- a/spec/frontend/issuable_suggestions/components/item_spec.js
+++ b/spec/frontend/issuable_suggestions/components/item_spec.js
@@ -16,7 +16,6 @@ describe('Issuable suggestions suggestion component', () => {
          ...suggestion,
        },
      },
-      sync: false,
      attachToDocument: true,
    });
  }

--- a/spec/frontend/issuables_list/components/issuable_spec.js
+++ b/spec/frontend/issuables_list/components/issuable_spec.js
@@ -44,7 +44,6 @@ describe('Issuable component', () => {
        baseUrl: TEST_BASE_URL,
        ...props,
      },
-      sync: false,
      attachToDocument: true,
    });
  };

--- a/spec/frontend/issuables_list/components/issuables_list_app_spec.js
+++ b/spec/frontend/issuables_list/components/issuables_list_app_spec.js
@@ -45,7 +45,6 @@ describe('Issuables list component', () => {
        emptySvgPath: TEST_EMPTY_SVG_PATH,
        ...props,
      },
-      sync: false,
      attachToDocument: true,
    });
  };

--- a/spec/frontend/issue_show/components/pinned_links_spec.js
+++ b/spec/frontend/issue_show/components/pinned_links_spec.js
@@ -18,7 +18,6 @@ describe('PinnedLinks', () => {

  const createComponent = props => {
    wrapper = shallowMount(PinnedLinks, {
-      sync: false,
      propsData: {
        zoomMeetingUrl: null,
        ...props,

--- a/spec/frontend/jobs/components/erased_block_spec.js
+++ b/spec/frontend/jobs/components/erased_block_spec.js
@@ -13,7 +13,6 @@ describe('Erased block', () => {
  const createComponent = props => {
    wrapper = mount(ErasedBlock, {
      propsData: props,
-      sync: false,
      attachToDocument: true,
    });
  };

--- a/spec/frontend/jobs/components/log/collapsible_section_spec.js
+++ b/spec/frontend/jobs/components/log/collapsible_section_spec.js
@@ -12,7 +12,6 @@ describe('Job Log Collapsible Section', () => {

  const createComponent = (props = {}) => {
    wrapper = mount(CollpasibleSection, {
-      sync: true,
      propsData: {
        ...props,
      },

--- a/spec/frontend/jobs/components/log/duration_badge_spec.js
+++ b/spec/frontend/jobs/components/log/duration_badge_spec.js
@@ -10,7 +10,6 @@ describe('Job Log Duration Badge', () => {

  const createComponent = (props = {}) => {
    wrapper = shallowMount(DurationBadge, {
-      sync: false,
      propsData: {
        ...props,
      },

--- a/spec/frontend/jobs/components/log/line_header_spec.js
+++ b/spec/frontend/jobs/components/log/line_header_spec.js
@@ -22,7 +22,6 @@ describe('Job Log Header Line', () => {

  const createComponent = (props = {}) => {
    wrapper = mount(LineHeader, {
-      sync: false,
      propsData: {
        ...props,
      },

--- a/spec/frontend/jobs/components/log/line_number_spec.js
+++ b/spec/frontend/jobs/components/log/line_number_spec.js
@@ -11,7 +11,6 @@ describe('Job Log Line Number', () => {

  const createComponent = (props = {}) => {
    wrapper = shallowMount(LineNumber, {
-      sync: false,
      propsData: {
        ...props,
      },

--- a/spec/frontend/jobs/components/log/line_spec.js
+++ b/spec/frontend/jobs/components/log/line_spec.js
@@ -20,7 +20,6 @@ describe('Job Log Line', () => {

  const createComponent = (props = {}) => {
    wrapper = shallowMount(Line, {
-      sync: false,
      propsData: {
        ...props,
      },

--- a/spec/frontend/jobs/components/log/log_spec.js
+++ b/spec/frontend/jobs/components/log/log_spec.js
@@ -15,7 +15,6 @@ describe('Job Log', () => {

  const createComponent = () => {
    wrapper = mount(Log, {
-      sync: false,
      localVue,
      store,
    });

--- a/spec/frontend/monitoring/components/charts/anomaly_spec.js
+++ b/spec/frontend/monitoring/components/charts/anomaly_spec.js
@@ -38,7 +38,6 @@ describe('Anomaly chart component', () => {
      slots: {
        default: mockWidgets,
      },
-      sync: false,
    });
  };
  const findTimeSeries = () => wrapper.find(MonitorTimeSeriesChart);

--- a/spec/frontend/monitoring/components/charts/column_spec.js
+++ b/spec/frontend/monitoring/components/charts/column_spec.js
@@ -32,7 +32,6 @@ describe('Column component', () => {
        },
        containerWidth: 100,
      },
-      sync: false,
    });
  });


--- a/spec/frontend/monitoring/components/charts/empty_chart_spec.js
+++ b/spec/frontend/monitoring/components/charts/empty_chart_spec.js
@@ -10,7 +10,6 @@ describe('Empty Chart component', () => {
      propsData: {
        graphTitle,
      },
-      sync: false,
    });
  });


--- a/spec/frontend/monitoring/components/charts/single_stat_spec.js
+++ b/spec/frontend/monitoring/components/charts/single_stat_spec.js
@@ -10,7 +10,6 @@ describe('Single Stat Chart component', () => {
      propsData: {
        graphData: graphDataPrometheusQuery,
      },
-      sync: false,
    });
  });


--- a/spec/frontend/monitoring/components/charts/time_series_spec.js
+++ b/spec/frontend/monitoring/components/charts/time_series_spec.js
@@ -58,7 +58,6 @@ describe('Time series component', () => {
        slots: {
          default: mockWidgets,
        },
-        sync: false,
        store,
        attachToDocument: true,
      });

--- a/spec/frontend/monitoring/components/dashboard_spec.js
+++ b/spec/frontend/monitoring/components/dashboard_spec.js
@@ -30,7 +30,6 @@ describe('Dashboard', () => {
  const createShallowWrapper = (props = {}, options = {}) => {
    wrapper = shallowMount(Dashboard, {
      localVue,
-      sync: false,
      propsData: { ...propsData, ...props },
      store,
      ...options,
@@ -40,7 +39,6 @@ describe('Dashboard', () => {
  const createMountedWrapper = (props = {}, options = {}) => {
    wrapper = mount(Dashboard, {
      localVue,
-      sync: false,
      propsData: { ...propsData, ...props },
      store,
      ...options,

--- a/spec/frontend/monitoring/components/dashboard_time_url_spec.js
+++ b/spec/frontend/monitoring/components/dashboard_time_url_spec.js
@@ -19,7 +19,6 @@ describe('dashboard invalid url parameters', () => {

  const createMountedWrapper = (props = {}, options = {}) => {
    wrapper = mount(Dashboard, {
-      sync: false,
      propsData: { ...propsData, ...props },
      store,
      ...options,

--- a/spec/frontend/monitoring/components/dashboard_time_window_spec.js
+++ b/spec/frontend/monitoring/components/dashboard_time_window_spec.js
@@ -24,7 +24,6 @@ describe('dashboard time window', () => {

  const createComponentWrapperMounted = (props = {}, options = {}) => {
    wrapper = mount(Dashboard, {
-      sync: false,
      propsData: { ...propsData, ...props },
      store,
      ...options,

--- a/spec/frontend/monitoring/components/date_time_picker/date_time_picker_input_spec.js
+++ b/spec/frontend/monitoring/components/date_time_picker/date_time_picker_input_spec.js
@@ -15,7 +15,6 @@ describe('DateTimePickerInput', () => {
        label: '',
        ...propsData,
      },
-      sync: false,
    });
  };


--- a/spec/frontend/monitoring/components/date_time_picker/date_time_picker_spec.js
+++ b/spec/frontend/monitoring/components/date_time_picker/date_time_picker_spec.js
@@ -30,7 +30,6 @@ describe('DateTimePicker', () => {
        end,
        ...props,
      },
-      sync: false,
    });
  };


--- a/spec/frontend/monitoring/components/graph_group_spec.js
+++ b/spec/frontend/monitoring/components/graph_group_spec.js
@@ -12,7 +12,6 @@ describe('Graph group component', () => {
  const createComponent = propsData => {
    wrapper = shallowMount(GraphGroup, {
      propsData,
-      sync: false,
    });
  };


--- a/spec/frontend/monitoring/panel_type_spec.js
+++ b/spec/frontend/monitoring/panel_type_spec.js
@@ -26,7 +26,6 @@ describe('Panel Type component', () => {
        ...props,
      },
      store,
-      sync: false,
      attachToDocument: true,
    });

@@ -152,7 +151,6 @@ describe('Panel Type component', () => {
          graphData: graphDataPrometheusQueryRange,
        },
        store,
-        sync: false,
        attachToDocument: true,
      });
      panelType.vm.$nextTick(done);

--- a/spec/frontend/notes/components/comment_form_spec.js
+++ b/spec/frontend/notes/components/comment_form_spec.js
@@ -37,7 +37,6 @@ describe('issue_comment_form component', () => {
        noteableType,
      },
      store,
-      sync: false,
      attachToDocument: true,
    });
  };

--- a/spec/frontend/notes/components/diff_discussion_header_spec.js
+++ b/spec/frontend/notes/components/diff_discussion_header_spec.js
@@ -21,7 +21,6 @@ describe('diff_discussion_header component', () => {
    wrapper = mount(diffDiscussionHeader, {
      store,
      propsData: { discussion: discussionMock },
-      sync: false,
    });
  });


--- a/spec/frontend/notes/components/discussion_actions_spec.js
+++ b/spec/frontend/notes/components/discussion_actions_spec.js
@@ -35,7 +35,6 @@ describe('DiscussionActions', () => {
        shouldShowJumpToNextDiscussion: true,
        ...props,
      },
-      sync: false,
      attachToDocument: true,
    });
  };

--- a/spec/frontend/notes/components/discussion_jump_to_next_button_spec.js
+++ b/spec/frontend/notes/components/discussion_jump_to_next_button_spec.js
@@ -6,7 +6,6 @@ describe('JumpToNextDiscussionButton', () => {

  beforeEach(() => {
    wrapper = shallowMount(JumpToNextDiscussionButton, {
-      sync: false,
      attachToDocument: true,
    });
  });

--- a/spec/frontend/notes/components/discussion_notes_replies_wrapper_spec.js
+++ b/spec/frontend/notes/components/discussion_notes_replies_wrapper_spec.js
@@ -16,7 +16,6 @@ describe('DiscussionNotesRepliesWrapper', () => {
  const createComponent = (props = {}) => {
    wrapper = mount(TestComponent, {
      propsData: props,
-      sync: false,
    });
  };


--- a/spec/frontend/notes/components/discussion_notes_spec.js
+++ b/spec/frontend/notes/components/discussion_notes_spec.js
@@ -31,7 +31,6 @@ describe('DiscussionNotes', () => {
      slots: {
        'avatar-badge': '<span class="avatar-badge-slot-content" />',
      },
-      sync: false,
      attachToDocument: true,
    });
  };

--- a/spec/frontend/notes/components/note_app_spec.js
+++ b/spec/frontend/notes/components/note_app_spec.js
@@ -62,7 +62,6 @@ describe('note_app', () => {
          attachToDocument: true,
          propsData,
          store,
-          sync: false,
        },
      );
    };

--- a/spec/frontend/notes/components/note_edited_text_spec.js
+++ b/spec/frontend/notes/components/note_edited_text_spec.js
@@ -21,7 +21,6 @@ describe('NoteEditedText', () => {
  beforeEach(() => {
    wrapper = shallowMount(NoteEditedText, {
      propsData,
-      sync: false,
      attachToDocument: true,
    });
  });

--- a/spec/frontend/pages/admin/users/components/delete_user_modal_spec.js
+++ b/spec/frontend/pages/admin/users/components/delete_user_modal_spec.js
@@ -48,7 +48,6 @@ describe('User Operation confirmation modal', () => {
      stubs: {
        GlModal: ModalStub,
      },
-      sync: false,
    });
  };


--- a/spec/frontend/pages/admin/users/components/user_modal_manager_spec.js
+++ b/spec/frontend/pages/admin/users/components/user_modal_manager_spec.js
@@ -29,7 +29,6 @@ describe('Users admin page Modal Manager', () => {
        csrfToken: 'dummyCSRF',
        ...props,
      },
-      sync: false,
    });
  };


--- a/spec/frontend/pages/admin/users/components/user_operation_confirmation_modal_spec.js
+++ b/spec/frontend/pages/admin/users/components/user_operation_confirmation_modal_spec.js
@@ -17,7 +17,6 @@ describe('User Operation confirmation modal', () => {
        method: 'method',
        ...props,
      },
-      sync: false,
    });
  };


--- a/spec/frontend/pipelines/graph/action_component_spec.js
+++ b/spec/frontend/pipelines/graph/action_component_spec.js
@@ -19,7 +19,6 @@ describe('pipeline graph action component', () => {
        link: 'foo',
        actionIcon: 'cancel',
      },
-      sync: false,
      attachToDocument: true,
    });
  });

--- a/spec/frontend/pipelines/graph/job_item_spec.js
+++ b/spec/frontend/pipelines/graph/job_item_spec.js
@@ -6,7 +6,10 @@ describe('pipeline graph job item', () => {
  let wrapper;

  const createWrapper = propsData => {
-    wrapper = mount(JobItem, { sync: false, attachToDocument: true, propsData });
+    wrapper = mount(JobItem, {
+      attachToDocument: true,
+      propsData,
+    });
  };

  const delayedJobFixture = getJSONFixture('jobs/delayed.json');

--- a/spec/frontend/pipelines/graph/linked_pipeline_spec.js
+++ b/spec/frontend/pipelines/graph/linked_pipeline_spec.js
@@ -19,7 +19,6 @@ describe('Linked pipeline', () => {

    beforeEach(() => {
      wrapper = mount(LinkedPipelineComponent, {
-        sync: false,
        attachToDocument: true,
        propsData: props,
      });
@@ -83,7 +82,6 @@ describe('Linked pipeline', () => {

    beforeEach(() => {
      wrapper = mount(LinkedPipelineComponent, {
-        sync: false,
        attachToDocument: true,
        propsData: props,
      });
@@ -101,7 +99,6 @@ describe('Linked pipeline', () => {

    beforeEach(() => {
      wrapper = mount(LinkedPipelineComponent, {
-        sync: false,
        attachToDocument: true,
        propsData: props,
      });

--- a/spec/frontend/pipelines/pipeline_triggerer_spec.js
+++ b/spec/frontend/pipelines/pipeline_triggerer_spec.js
@@ -24,7 +24,6 @@ describe('Pipelines Triggerer', () => {
  const createComponent = () => {
    wrapper = shallowMount(pipelineTriggerer, {
      propsData: mockData,
-      sync: false,
      attachToDocument: true,
    });
  };

--- a/spec/frontend/pipelines/pipeline_url_spec.js
+++ b/spec/frontend/pipelines/pipeline_url_spec.js
@@ -10,7 +10,6 @@ describe('Pipeline Url Component', () => {

  const createComponent = props => {
    wrapper = shallowMount(PipelineUrlComponent, {
-      sync: false,
      attachToDocument: true,
      propsData: props,
    });

--- a/spec/frontend/pipelines/pipelines_table_row_spec.js
+++ b/spec/frontend/pipelines/pipelines_table_row_spec.js
@@ -12,7 +12,6 @@ describe('Pipelines Table Row', () => {
        autoDevopsHelpPath: 'foo',
        viewType: 'root',
      },
-      sync: false,
    });

  let wrapper;

--- a/spec/frontend/registry/list/components/app_spec.js
+++ b/spec/frontend/registry/list/components/app_spec.js
@@ -62,7 +62,6 @@ describe('Registry List', () => {
    beforeEach(() => {
      wrapper = mount(registry, {
        attachToDocument: true,
-        sync: false,
        propsData,
        computed: {
          repos() {

--- a/spec/frontend/registry/list/components/project_empty_state_spec.js
+++ b/spec/frontend/registry/list/components/project_empty_state_spec.js
@@ -7,7 +7,6 @@ describe('Registry Project Empty state', () => {
  beforeEach(() => {
    wrapper = mount(projectEmptyState, {
      attachToDocument: true,
-      sync: false,
      propsData: {
        noContainersImage: 'imageUrl',
        helpPagePath: 'help',

--- a/spec/frontend/registry/settings/components/registry_settings_app_spec.js
+++ b/spec/frontend/registry/settings/components/registry_settings_app_spec.js
@@ -17,7 +17,6 @@ describe('Registry Settings App', () => {
  const mountComponent = (options = {}) => {
    fetchSpy = jest.fn();
    wrapper = shallowMount(component, {
-      sync: false,
      store,
      methods: {
        fetchSettings: fetchSpy,

--- a/spec/frontend/registry/settings/components/settings_form_spec.js
+++ b/spec/frontend/registry/settings/components/settings_form_spec.js
@@ -24,7 +24,6 @@ describe('Settings Form', () => {
    saveSpy = jest.fn();
    resetSpy = jest.fn();
    wrapper = shallowMount(component, {
-      sync: false,
      store,
      methods: {
        saveSettings: saveSpy,

--- a/spec/frontend/releases/detail/components/app_spec.js
+++ b/spec/frontend/releases/detail/components/app_spec.js
@@ -29,7 +29,10 @@ describe('Release detail component', () => {

    const store = new Vuex.Store({ actions, state });

-    wrapper = mount(ReleaseDetailApp, { store, sync: false, attachToDocument: true });
+    wrapper = mount(ReleaseDetailApp, {
+      store,
+      attachToDocument: true,
+    });

    return wrapper.vm.$nextTick();
  });

--- a/spec/frontend/releases/list/components/release_block_footer_spec.js
+++ b/spec/frontend/releases/list/components/release_block_footer_spec.js
@@ -27,7 +27,6 @@ describe('Release block footer', () => {
        ...convertObjectPropsToCamelCase(releaseClone),
        ...props,
      },
-      sync: false,
    });

    return wrapper.vm.$nextTick();

--- a/spec/frontend/releases/list/components/release_block_milestone_info_spec.js
+++ b/spec/frontend/releases/list/components/release_block_milestone_info_spec.js
@@ -14,7 +14,6 @@ describe('Release block milestone info', () => {
      propsData: {
        milestones: milestonesProp,
      },
-      sync: false,
    });

    return wrapper.vm.$nextTick();

--- a/spec/frontend/releases/list/components/release_block_spec.js
+++ b/spec/frontend/releases/list/components/release_block_spec.js
@@ -34,7 +34,6 @@ describe('Release block', () => {
          ...featureFlags,
        },
      },
-      sync: false,
    });

    return wrapper.vm.$nextTick();

--- a/spec/frontend/serverless/components/area_spec.js
+++ b/spec/frontend/serverless/components/area_spec.js
@@ -16,7 +16,6 @@ describe('Area component', () => {
      slots: {
        default: mockWidgets,
      },
-      sync: false,
    });
  });


--- a/spec/frontend/serverless/components/environment_row_spec.js
+++ b/spec/frontend/serverless/components/environment_row_spec.js
@@ -5,7 +5,9 @@ import { mockServerlessFunctions, mockServerlessFunctionsDiffEnv } from '../mock
 import { translate } from '~/serverless/utils';

 const createComponent = (env, envName) =>
-  shallowMount(environmentRowComponent, { propsData: { env, envName }, sync: false }).vm;
+  shallowMount(environmentRowComponent, {
+    propsData: { env, envName },
+  }).vm;

 describe('environment row component', () => {
  describe('default global cluster case', () => {

--- a/spec/frontend/serverless/components/function_details_spec.js
+++ b/spec/frontend/serverless/components/function_details_spec.js
@@ -41,7 +41,6 @@ describe('functionDetailsComponent', () => {
          clustersPath: '/clusters',
          helpPath: '/help',
        },
-        sync: false,
      });

      expect(
@@ -69,7 +68,6 @@ describe('functionDetailsComponent', () => {
          clustersPath: '/clusters',
          helpPath: '/help',
        },
-        sync: false,
      });

      expect(component.vm.$el.querySelector('p').innerHTML.trim()).toContain('1 pod in use');
@@ -87,7 +85,6 @@ describe('functionDetailsComponent', () => {
          clustersPath: '/clusters',
          helpPath: '/help',
        },
-        sync: false,
      });

      expect(component.vm.$el.querySelector('p').innerHTML.trim()).toContain('3 pods in use');
@@ -105,7 +102,6 @@ describe('functionDetailsComponent', () => {
          clustersPath: '/clusters',
          helpPath: '/help',
        },
-        sync: false,
      });

      expect(

--- a/spec/frontend/serverless/components/function_row_spec.js
+++ b/spec/frontend/serverless/components/function_row_spec.js
@@ -8,7 +8,9 @@ describe('functionRowComponent', () => {
  let wrapper;

  const createComponent = func => {
-    wrapper = shallowMount(functionRowComponent, { propsData: { func }, sync: false });
+    wrapper = shallowMount(functionRowComponent, {
+      propsData: { func },
+    });
  };

  afterEach(() => {

--- a/spec/frontend/serverless/components/functions_spec.js
+++ b/spec/frontend/serverless/components/functions_spec.js
@@ -43,7 +43,6 @@ describe('functionsComponent', () => {
        helpPath: '',
        statusPath: '',
      },
-      sync: false,
    });

    expect(component.find(EmptyState).exists()).toBe(true);
@@ -59,7 +58,6 @@ describe('functionsComponent', () => {
        helpPath: '',
        statusPath: '',
      },
-      sync: false,
    });

    expect(component.find(GlLoadingIcon).exists()).toBe(true);
@@ -75,7 +73,6 @@ describe('functionsComponent', () => {
        helpPath: '',
        statusPath: '',
      },
-      sync: false,
    });

    expect(
@@ -102,7 +99,6 @@ describe('functionsComponent', () => {
        helpPath: '',
        statusPath: '',
      },
-      sync: false,
    });

    expect(component.find('.js-functions-wrapper').exists()).toBe(true);
@@ -118,7 +114,6 @@ describe('functionsComponent', () => {
        helpPath: 'helpPath',
        statusPath,
      },
-      sync: false,
    });

    component.vm.$store.dispatch('receiveFunctionsSuccess', mockServerlessFunctions);

--- a/spec/frontend/serverless/components/missing_prometheus_spec.js
+++ b/spec/frontend/serverless/components/missing_prometheus_spec.js
@@ -9,7 +9,6 @@ const createComponent = missingData =>
      helpPath: '/help',
      missingData,
    },
-    sync: false,
  });

 describe('missingPrometheusComponent', () => {

--- a/spec/frontend/serverless/components/pod_box_spec.js
+++ b/spec/frontend/serverless/components/pod_box_spec.js
@@ -6,7 +6,6 @@ const createComponent = count =>
    propsData: {
      count,
    },
-    sync: false,
  }).vm;

 describe('podBoxComponent', () => {

--- a/spec/frontend/serverless/components/url_spec.js
+++ b/spec/frontend/serverless/components/url_spec.js
@@ -8,7 +8,6 @@ const createComponent = uri =>
    propsData: {
      uri,
    },
-    sync: false,
  });

 describe('urlComponent', () => {

--- a/spec/frontend/sidebar/assignees_spec.js
+++ b/spec/frontend/sidebar/assignees_spec.js
--- a/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js
+++ b/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js
--- a/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js
+++ b/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js
--- a/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js
+++ b/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js
--- a/spec/frontend/sidebar/components/assignees/collapsed_assignee_spec.js
+++ b/spec/frontend/sidebar/components/assignees/collapsed_assignee_spec.js
--- a/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js
+++ b/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js
--- a/spec/frontend/sidebar/confidential_issue_sidebar_spec.js
+++ b/spec/frontend/sidebar/confidential_issue_sidebar_spec.js
--- a/spec/frontend/sidebar/todo_spec.js
+++ b/spec/frontend/sidebar/todo_spec.js
--- a/spec/frontend/snippets/components/app_spec.js
+++ b/spec/frontend/snippets/components/app_spec.js
--- a/spec/frontend/snippets/components/snippet_header_spec.js
+++ b/spec/frontend/snippets/components/snippet_header_spec.js
--- a/spec/frontend/snippets/components/snippet_title_spec.js
+++ b/spec/frontend/snippets/components/snippet_title_spec.js
--- a/spec/frontend/vue_mr_widget/components/artifacts_list_app_spec.js
+++ b/spec/frontend/vue_mr_widget/components/artifacts_list_app_spec.js
--- a/spec/frontend/vue_mr_widget/components/artifacts_list_spec.js
+++ b/spec/frontend/vue_mr_widget/components/artifacts_list_spec.js
--- a/spec/frontend/vue_mr_widget/components/mr_widget_icon_spec.js
+++ b/spec/frontend/vue_mr_widget/components/mr_widget_icon_spec.js
--- a/spec/frontend/vue_mr_widget/components/states/commit_edit_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/commit_edit_spec.js
--- a/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js
--- a/spec/frontend/vue_mr_widget/components/states/mr_widget_commit_message_dropdown_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_commit_message_dropdown_spec.js
--- a/spec/frontend/vue_mr_widget/components/states/mr_widget_commits_header_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_commits_header_spec.js
--- a/spec/frontend/vue_shared/components/changed_file_icon_spec.js
+++ b/spec/frontend/vue_shared/components/changed_file_icon_spec.js
--- a/spec/frontend/vue_shared/components/clipboard_button_spec.js
+++ b/spec/frontend/vue_shared/components/clipboard_button_spec.js
--- a/spec/frontend/vue_shared/components/commit_spec.js
+++ b/spec/frontend/vue_shared/components/commit_spec.js
--- a/spec/frontend/vue_shared/components/file_icon_spec.js
+++ b/spec/frontend/vue_shared/components/file_icon_spec.js
--- a/spec/frontend/vue_shared/components/gl_toggle_vuex_spec.js
+++ b/spec/frontend/vue_shared/components/gl_toggle_vuex_spec.js
--- a/spec/frontend/vue_shared/components/issue/issue_assignees_spec.js
+++ b/spec/frontend/vue_shared/components/issue/issue_assignees_spec.js
--- a/spec/frontend/vue_shared/components/issue/issue_milestone_spec.js
+++ b/spec/frontend/vue_shared/components/issue/issue_milestone_spec.js
--- a/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js
+++ b/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js
--- a/spec/frontend/vue_shared/components/markdown/field_spec.js
+++ b/spec/frontend/vue_shared/components/markdown/field_spec.js
--- a/spec/frontend/vue_shared/components/markdown/header_spec.js
+++ b/spec/frontend/vue_shared/components/markdown/header_spec.js
--- a/spec/frontend/vue_shared/components/markdown/suggestion_diff_header_spec.js
+++ b/spec/frontend/vue_shared/components/markdown/suggestion_diff_header_spec.js
--- a/spec/frontend/vue_shared/components/modal_copy_button_spec.js
+++ b/spec/frontend/vue_shared/components/modal_copy_button_spec.js
--- a/spec/frontend/vue_shared/components/notes/system_note_spec.js
+++ b/spec/frontend/vue_shared/components/notes/system_note_spec.js
--- a/spec/frontend/vue_shared/components/paginated_list_spec.js
+++ b/spec/frontend/vue_shared/components/paginated_list_spec.js
--- a/spec/frontend/vue_shared/components/pagination_links_spec.js
+++ b/spec/frontend/vue_shared/components/pagination_links_spec.js
--- a/spec/frontend/vue_shared/components/recaptcha_modal_spec.js
+++ b/spec/frontend/vue_shared/components/recaptcha_modal_spec.js
--- a/spec/frontend/vue_shared/components/sidebar/labels_select/base_spec.js
+++ b/spec/frontend/vue_shared/components/sidebar/labels_select/base_spec.js
--- a/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_value_spec.js
+++ b/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_value_spec.js
--- a/spec/frontend/vue_shared/components/slot_switch_spec.js
+++ b/spec/frontend/vue_shared/components/slot_switch_spec.js
--- a/spec/frontend/vue_shared/components/split_button_spec.js
+++ b/spec/frontend/vue_shared/components/split_button_spec.js
--- a/spec/frontend/vue_shared/components/table_pagination_spec.js
+++ b/spec/frontend/vue_shared/components/table_pagination_spec.js
--- a/spec/frontend/vue_shared/components/time_ago_tooltip_spec.js
+++ b/spec/frontend/vue_shared/components/time_ago_tooltip_spec.js
--- a/spec/frontend/vue_shared/components/user_avatar/user_avatar_image_spec.js
+++ b/spec/frontend/vue_shared/components/user_avatar/user_avatar_image_spec.js
--- a/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js
+++ b/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js
--- a/spec/frontend/vue_shared/components/user_popover/user_popover_spec.js
+++ b/spec/frontend/vue_shared/components/user_popover/user_popover_spec.js
--- a/spec/frontend/vue_shared/directives/track_event_spec.js
+++ b/spec/frontend/vue_shared/directives/track_event_spec.js
--- a/spec/javascripts/diffs/components/compare_versions_dropdown_spec.js
+++ b/spec/javascripts/diffs/components/compare_versions_dropdown_spec.js
--- a/spec/javascripts/diffs/components/diff_discussions_spec.js
+++ b/spec/javascripts/diffs/components/diff_discussions_spec.js
--- a/spec/javascripts/frequent_items/components/frequent_items_list_item_spec.js
+++ b/spec/javascripts/frequent_items/components/frequent_items_list_item_spec.js
--- a/spec/javascripts/jobs/components/manual_variables_form_spec.js
+++ b/spec/javascripts/jobs/components/manual_variables_form_spec.js
--- a/spec/javascripts/notes/components/discussion_resolve_with_issue_button_spec.js
+++ b/spec/javascripts/notes/components/discussion_resolve_with_issue_button_spec.js
--- a/spec/javascripts/notes/components/note_actions/reply_button_spec.js
+++ b/spec/javascripts/notes/components/note_actions/reply_button_spec.js
--- a/spec/javascripts/notes/components/note_actions_spec.js
+++ b/spec/javascripts/notes/components/note_actions_spec.js
--- a/spec/javascripts/notes/components/note_form_spec.js
+++ b/spec/javascripts/notes/components/note_form_spec.js
--- a/spec/javascripts/notes/components/noteable_discussion_spec.js
+++ b/spec/javascripts/notes/components/noteable_discussion_spec.js
--- a/spec/javascripts/notes/components/noteable_note_spec.js
+++ b/spec/javascripts/notes/components/noteable_note_spec.js
--- a/spec/javascripts/related_merge_requests/components/related_merge_requests_spec.js
+++ b/spec/javascripts/related_merge_requests/components/related_merge_requests_spec.js
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_alert_message_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/mr_widget_alert_message_spec.js
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_container_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_container_spec.js
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js
--- a/spec/javascripts/vue_shared/components/pagination/graphql_pagination_spec.js
+++ b/spec/javascripts/vue_shared/components/pagination/graphql_pagination_spec.js
--- a/spec/javascripts/vue_shared/components/project_selector/project_list_item_spec.js
+++ b/spec/javascripts/vue_shared/components/project_selector/project_list_item_spec.js
--- a/spec/javascripts/vue_shared/components/project_selector/project_selector_spec.js
+++ b/spec/javascripts/vue_shared/components/project_selector/project_selector_spec.js
--- a/spec/javascripts/vue_shared/components/tooltip_on_truncate_spec.js
+++ b/spec/javascripts/vue_shared/components/tooltip_on_truncate_spec.js
--- a/spec/services/auto_merge_service_spec.rb
+++ b/spec/services/auto_merge_service_spec.rb
--- a/spec/services/award_emojis/add_service_spec.rb
+++ b/spec/services/award_emojis/add_service_spec.rb
--- a/spec/services/award_emojis/destroy_service_spec.rb
+++ b/spec/services/award_emojis/destroy_service_spec.rb
--- a/spec/services/award_emojis/toggle_service_spec.rb
+++ b/spec/services/award_emojis/toggle_service_spec.rb
--- a/spec/services/boards/issues/move_service_spec.rb
+++ b/spec/services/boards/issues/move_service_spec.rb
--- a/spec/services/ci/create_pipeline_service_spec.rb
+++ b/spec/services/ci/create_pipeline_service_spec.rb
--- a/spec/services/ci/ensure_stage_service_spec.rb
+++ b/spec/services/ci/ensure_stage_service_spec.rb
--- a/spec/services/ci/expire_pipeline_cache_service_spec.rb
+++ b/spec/services/ci/expire_pipeline_cache_service_spec.rb
--- a/spec/services/ci/register_job_service_spec.rb
+++ b/spec/services/ci/register_job_service_spec.rb
--- a/spec/services/ci/retry_build_service_spec.rb
+++ b/spec/services/ci/retry_build_service_spec.rb
--- a/spec/services/error_tracking/list_issues_service_spec.rb
+++ b/spec/services/error_tracking/list_issues_service_spec.rb
--- a/spec/services/error_tracking/list_projects_service_spec.rb
+++ b/spec/services/error_tracking/list_projects_service_spec.rb
--- a/spec/services/external_pull_requests/create_pipeline_service_spec.rb
+++ b/spec/services/external_pull_requests/create_pipeline_service_spec.rb
--- a/spec/services/git/branch_push_service_spec.rb
+++ b/spec/services/git/branch_push_service_spec.rb
--- a/spec/services/groups/auto_devops_service_spec.rb
+++ b/spec/services/groups/auto_devops_service_spec.rb
--- a/spec/services/issues/referenced_merge_requests_service_spec.rb
+++ b/spec/services/issues/referenced_merge_requests_service_spec.rb
--- a/spec/services/issues/reorder_service_spec.rb
+++ b/spec/services/issues/reorder_service_spec.rb
--- a/spec/services/issues/zoom_link_service_spec.rb
+++ b/spec/services/issues/zoom_link_service_spec.rb
--- a/spec/services/merge_requests/create_pipeline_service_spec.rb
+++ b/spec/services/merge_requests/create_pipeline_service_spec.rb
--- a/spec/services/merge_requests/merge_service_spec.rb
+++ b/spec/services/merge_requests/merge_service_spec.rb
--- a/spec/services/merge_requests/merge_to_ref_service_spec.rb
+++ b/spec/services/merge_requests/merge_to_ref_service_spec.rb
--- a/spec/services/metrics/dashboard/custom_metric_embed_service_spec.rb
+++ b/spec/services/metrics/dashboard/custom_metric_embed_service_spec.rb
--- a/spec/services/metrics/dashboard/default_embed_service_spec.rb
+++ b/spec/services/metrics/dashboard/default_embed_service_spec.rb
--- a/spec/services/metrics/dashboard/dynamic_embed_service_spec.rb
+++ b/spec/services/metrics/dashboard/dynamic_embed_service_spec.rb
--- a/spec/services/metrics/dashboard/project_dashboard_service_spec.rb
+++ b/spec/services/metrics/dashboard/project_dashboard_service_spec.rb
--- a/spec/services/metrics/dashboard/system_dashboard_service_spec.rb
+++ b/spec/services/metrics/dashboard/system_dashboard_service_spec.rb
--- a/spec/services/notes/create_service_spec.rb
+++ b/spec/services/notes/create_service_spec.rb
--- a/spec/services/notes/destroy_service_spec.rb
+++ b/spec/services/notes/destroy_service_spec.rb
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
--- a/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
+++ b/spec/services/projects/container_repository/cleanup_tags_service_spec.rb
--- a/spec/services/projects/container_repository/delete_tags_service_spec.rb
+++ b/spec/services/projects/container_repository/delete_tags_service_spec.rb
--- a/spec/services/projects/container_repository/destroy_service_spec.rb
+++ b/spec/services/projects/container_repository/destroy_service_spec.rb
--- a/spec/services/projects/detect_repository_languages_service_spec.rb
+++ b/spec/services/projects/detect_repository_languages_service_spec.rb
--- a/spec/services/projects/gitlab_projects_import_service_spec.rb
+++ b/spec/services/projects/gitlab_projects_import_service_spec.rb
--- a/spec/services/projects/housekeeping_service_spec.rb
+++ b/spec/services/projects/housekeeping_service_spec.rb
--- a/spec/services/projects/open_merge_requests_count_service_spec.rb
+++ b/spec/services/projects/open_merge_requests_count_service_spec.rb
--- a/spec/services/projects/operations/update_service_spec.rb
+++ b/spec/services/projects/operations/update_service_spec.rb
--- a/spec/services/projects/participants_service_spec.rb
+++ b/spec/services/projects/participants_service_spec.rb
--- a/spec/services/projects/update_pages_service_spec.rb
+++ b/spec/services/projects/update_pages_service_spec.rb
--- a/spec/services/prometheus/proxy_service_spec.rb
+++ b/spec/services/prometheus/proxy_service_spec.rb
--- a/spec/services/resource_events/change_labels_service_spec.rb
+++ b/spec/services/resource_events/change_labels_service_spec.rb
--- a/spec/services/resource_events/merge_into_notes_service_spec.rb
+++ b/spec/services/resource_events/merge_into_notes_service_spec.rb
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
--- a/spec/services/system_notes/commit_service_spec.rb
+++ b/spec/services/system_notes/commit_service_spec.rb