Add latest changes from gitlab-org/gitlab@master

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,

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) {

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

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

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. |

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:

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. |

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:

spec/frontend/admin/statistics_panel/components/app_spec.js

@@ -21,7 +21,6 @@ describe('Admin statistics app', () => {
     wrapper = shallowMount(StatisticsPanelApp, {
       localVue,
       store,
-      sync: false,
     });
   };

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,
       });
     });

spec/frontend/boards/issue_card_spec.js

@@ -50,7 +50,6 @@ describe('Issue card component', () => {
         rootPath: '/',
       },
       store,
-      sync: false,
       attachToDocument: true,
     });
   });

spec/frontend/clusters/components/remove_cluster_confirmation_spec.js

@@ -13,7 +13,6 @@ describe('Remove cluster confirmation modal', () => {
         clusterName: 'clusterName',
         ...props,
       },
-      sync: false,
     });
   };

spec/frontend/commit/commit_pipeline_status_component_spec.js

@@ -33,7 +33,6 @@ describe('Commit pipeline status component', () => {
         ...defaultProps,
         ...props,
       },
-      sync: false,
     });
   };

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 = {}) =>

spec/frontend/cycle_analytics/limit_warning_component_spec.js

@@ -10,7 +10,6 @@ const createComponent = props =>
     propsData: {
       ...props,
     },
-    sync: false,
     attachToDocument: true,
   });

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,

spec/frontend/diffs/components/diff_content_spec.js

@@ -84,7 +84,6 @@ describe('DiffContent', () => {
       },
       localVue,
       store: fakeStore,
-      sync: false,
     });
   };

spec/frontend/diffs/components/diff_discussion_reply_spec.js

@@ -16,7 +16,6 @@ describe('DiffDiscussionReply', () => {
     wrapper = shallowMount(DiffDiscussionReply, {
       store,
       localVue,
-      sync: false,
       propsData: {
         ...props,
       },

spec/frontend/diffs/components/diff_file_header_spec.js

@@ -91,7 +91,6 @@ describe('DiffFileHeader component', () => {
       },
       localVue,
       store,
-      sync: false,
       attachToDocument: true,
     });
   };

spec/frontend/diffs/components/diff_gutter_avatars_spec.js

@@ -16,7 +16,6 @@ describe('DiffGutterAvatars', () => {
       propsData: {
         ...props,
       },
-      sync: false,
       attachToDocument: true,
     });
   };