Add latest changes from gitlab-org/gitlab@master

doc/ci/environments.md

@@ -294,8 +294,8 @@ For the value of:
   We have used `$CI_ENVIRONMENT_SLUG` here because it is guaranteed to be unique. If
   you're using a workflow like [GitLab Flow](../topics/gitlab_flow.md), collisions
   are unlikely and you may prefer environment names to be more closely based on the
-  branch name. In that case, you could use `$CI_COMMIT_REF_SLUG` in `environment:url` in
-  the example above: `https://$CI_COMMIT_REF_SLUG.example.com`, which would give a URL
+  branch name. In that case, you could use `$CI_COMMIT_REF_NAME` in `environment:url` in
+  the example above: `https://$CI_COMMIT_REF_NAME.example.com`, which would give a URL
   of `https://100-do-the-thing.example.com`.
 
 NOTE: **Note:**

doc/ci/examples/deployment/README.md

@@ -35,8 +35,8 @@ apt-get install ruby-dev
 The Dpl provides support for vast number of services, including: Heroku, Cloud Foundry, AWS/S3, and more.
 To use it simply define provider and any additional parameters required by the provider.
 
-For example if you want to use it to deploy your application to heroku, you need to specify `heroku` as provider, specify `api-key` and `app`.
-There's more and all possible parameters can be found here: <https://github.com/travis-ci/dpl#heroku>.
+For example if you want to use it to deploy your application to Heroku, you need to specify `heroku` as provider, specify `api-key` and `app`.
+All possible parameters can be found here: <https://github.com/travis-ci/dpl#heroku-api>.
 
 ```yaml
 staging:

doc/user/group/index.md

@@ -353,7 +353,7 @@ content.
 Restriction currently applies to:
 
 - UI.
-- API access.
+- [From GitLab 12.3](https://gitlab.com/gitlab-org/gitlab/issues/12874), API access.
 - [From GitLab 12.4](https://gitlab.com/gitlab-org/gitlab/issues/32113), Git actions via SSH.
 
 To avoid accidental lock-out, admins and group owners are are able to access

doc/user/project/clusters/add_remove_clusters.md

@@ -119,7 +119,7 @@ GitLab supports:
 - Creating a new GKE cluster using the GitLab UI.
 - Providing credentials to add an [existing Kubernetes cluster](#add-existing-cluster).
 
-Starting from [GitLab 12.4](https://gitlab.com/gitlab-org/gitlab/issues/25925), all the GKE clusters provisioned by GitLab are [VPC-Native](https://cloud.google.com/kubernetes-engine/docs/how-to/alias-ips).
+Starting from [GitLab 12.4](https://gitlab.com/gitlab-org/gitlab/issues/25925), all the GKE clusters provisioned by GitLab are [VPC-native](https://cloud.google.com/kubernetes-engine/docs/how-to/alias-ips).
 
 NOTE: **Note:**
 The [Google authentication integration](../../../integration/google.md) must
@@ -281,6 +281,19 @@ To add an existing Kubernetes cluster to your project:
         kubectl apply -f gitlab-admin-service-account.yaml
         ```
 
+        You will need the `container.clusterRoleBindings.create` permission
+        to create cluster-level roles. If you do not have this permission,
+        you can alternatively enable Basic Authentication and then run the
+        `kubectl apply` command as an admin:
+
+        ```bash
+        kubectl apply -f gitlab-admin-service-account.yaml --username=admin --password=<password>
+        ```
+
+        NOTE: **Note:**
+        Basic Authentication can be turned on and the password credentials
+        can be obtained using the Google Cloud Console.
+
         Output:
 
         ```bash

spec/frontend/issue_show/helpers.js

+// eslint-disable-next-line import/prefer-default-export
+export const keyboardDownEvent = (code, metaKey = false, ctrlKey = false) => {
+  const e = new CustomEvent('keydown');
+
+  e.keyCode = code;
+  e.metaKey = metaKey;
+  e.ctrlKey = ctrlKey;
+
+  return e;
+};

spec/frontend/notes/components/discussion_actions_spec.js

 import createStore from '~/notes/stores';
 import { shallowMount, mount, createLocalVue } from '@vue/test-utils';
-import { discussionMock } from '../../../javascripts/notes/mock_data';
+import { discussionMock } from '../../notes/mock_data';
 import DiscussionActions from '~/notes/components/discussion_actions.vue';
 import ReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vue';
 import ResolveDiscussionButton from '~/notes/components/discussion_resolve_button.vue';

spec/frontend/notes/components/discussion_notes_spec.js

@@ -8,11 +8,7 @@ import PlaceholderSystemNote from '~/vue_shared/components/notes/placeholder_sys
 import SystemNote from '~/vue_shared/components/notes/system_note.vue';
 import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue';
 import createStore from '~/notes/stores';
-import {
-  noteableDataMock,
-  discussionMock,
-  notesDataMock,
-} from '../../../javascripts/notes/mock_data';
+import { noteableDataMock, discussionMock, notesDataMock } from '../../notes/mock_data';
 
 const localVue = createLocalVue();
 

spec/frontend/notes/components/note_app_spec.js

@@ -9,7 +9,7 @@ import createStore from '~/notes/stores';
 import '~/behaviors/markdown/render_gfm';
 import { setTestTimeout } from 'helpers/timeout';
 // TODO: use generated fixture (https://gitlab.com/gitlab-org/gitlab-foss/issues/62491)
-import * as mockData from '../../../javascripts/notes/mock_data';
+import * as mockData from '../../notes/mock_data';
 
 setTestTimeout(1000);
 

spec/frontend/vue_shared/components/notes/placeholder_note_spec.js

 import Vue from 'vue';
 import issuePlaceholderNote from '~/vue_shared/components/notes/placeholder_note.vue';
 import createStore from '~/notes/stores';
-import { userDataMock } from '../../../../javascripts/notes/mock_data';
+import { userDataMock } from '../../../notes/mock_data';
 
 describe('issue placeholder system note component', () => {
   let store;

spec/javascripts/issue_show/helpers.js

-// eslint-disable-next-line import/prefer-default-export
-export const keyboardDownEvent = (code, metaKey = false, ctrlKey = false) => {
-  const e = new CustomEvent('keydown');
-
-  e.keyCode = code;
-  e.metaKey = metaKey;
-  e.ctrlKey = ctrlKey;
-
-  return e;
-};
+export * from '../../frontend/issue_show/helpers.js';