Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/api.js

@@ -47,6 +47,7 @@ const Api = {
   adminStatisticsPath: '/api/:version/application/statistics',
   pipelineSinglePath: '/api/:version/projects/:id/pipelines/:pipeline_id',
   lsifPath: '/api/:version/projects/:id/commits/:commit_id/lsif/info',
+  environmentsPath: '/api/:version/projects/:id/environments',
   group(groupId, callback) {
     const url = Api.buildUrl(Api.groupPath).replace(':id', groupId);
@@ -483,6 +484,11 @@ const Api = {
     return axios.get(url, { params: { path } });
   },
+  environments(id) {
+    const url = Api.buildUrl(this.environmentsPath).replace(':id', encodeURIComponent(id));
+    return axios.get(url);
+  },
+
   buildUrl(url) {
     return joinPaths(gon.relative_url_root || '', url.replace(':version', gon.api_version));
   },

app/assets/javascripts/ci_variable_list/store/actions.js

+import * as types from './mutation_types';
+import axios from '~/lib/utils/axios_utils';
+import Api from '~/api';
+import createFlash from '~/flash';
+import { __ } from '~/locale';
+import { prepareDataForApi, prepareDataForDisplay, prepareEnvironments } from './utils';
+
+export const toggleValues = ({ commit }, valueState) => {
+  commit(types.TOGGLE_VALUES, valueState);
+};
+
+export const clearModal = ({ commit }) => {
+  commit(types.CLEAR_MODAL);
+};
+
+export const resetEditing = ({ commit, dispatch }) => {
+  // fetch variables again if modal is being edited and then hidden
+  // without saving changes, to cover use case of reactivity in the table
+  dispatch('fetchVariables');
+  commit(types.RESET_EDITING);
+};
+
+export const requestAddVariable = ({ commit }) => {
+  commit(types.REQUEST_ADD_VARIABLE);
+};
+
+export const receiveAddVariableSuccess = ({ commit }) => {
+  commit(types.RECEIVE_ADD_VARIABLE_SUCCESS);
+};
+
+export const receiveAddVariableError = ({ commit }, error) => {
+  commit(types.RECEIVE_ADD_VARIABLE_ERROR, error);
+};
+
+export const addVariable = ({ state, dispatch }) => {
+  dispatch('requestAddVariable');
+
+  return axios
+    .patch(state.endpoint, {
+      variables_attributes: [prepareDataForApi(state.variable)],
+    })
+    .then(() => {
+      dispatch('receiveAddVariableSuccess');
+      dispatch('fetchVariables');
+    })
+    .catch(error => {
+      createFlash(error.response.data[0]);
+      dispatch('receiveAddVariableError', error);
+    });
+};
+
+export const requestUpdateVariable = ({ commit }) => {
+  commit(types.REQUEST_UPDATE_VARIABLE);
+};
+
+export const receiveUpdateVariableSuccess = ({ commit }) => {
+  commit(types.RECEIVE_UPDATE_VARIABLE_SUCCESS);
+};
+
+export const receiveUpdateVariableError = ({ commit }, error) => {
+  commit(types.RECEIVE_UPDATE_VARIABLE_ERROR, error);
+};
+
+export const updateVariable = ({ state, dispatch }, variable) => {
+  dispatch('requestUpdateVariable');
+
+  const updatedVariable = prepareDataForApi(variable);
+  updatedVariable.secrect_value = updateVariable.value;
+
+  return axios
+    .patch(state.endpoint, { variables_attributes: [updatedVariable] })
+    .then(() => {
+      dispatch('receiveUpdateVariableSuccess');
+      dispatch('fetchVariables');
+    })
+    .catch(error => {
+      createFlash(error.response.data[0]);
+      dispatch('receiveUpdateVariableError', error);
+    });
+};
+
+export const editVariable = ({ commit }, variable) => {
+  const variableToEdit = variable;
+  variableToEdit.secret_value = variableToEdit.value;
+  commit(types.VARIABLE_BEING_EDITED, variableToEdit);
+};
+
+export const requestVariables = ({ commit }) => {
+  commit(types.REQUEST_VARIABLES);
+};
+export const receiveVariablesSuccess = ({ commit }, variables) => {
+  commit(types.RECEIVE_VARIABLES_SUCCESS, variables);
+};
+
+export const fetchVariables = ({ dispatch, state }) => {
+  dispatch('requestVariables');
+
+  return axios
+    .get(state.endpoint)
+    .then(({ data }) => {
+      dispatch('receiveVariablesSuccess', prepareDataForDisplay(data.variables));
+    })
+    .catch(() => {
+      createFlash(__('There was an error fetching the variables.'));
+    });
+};
+
+export const requestDeleteVariable = ({ commit }) => {
+  commit(types.REQUEST_DELETE_VARIABLE);
+};
+
+export const receiveDeleteVariableSuccess = ({ commit }) => {
+  commit(types.RECEIVE_DELETE_VARIABLE_SUCCESS);
+};
+
+export const receiveDeleteVariableError = ({ commit }, error) => {
+  commit(types.RECEIVE_DELETE_VARIABLE_ERROR, error);
+};
+
+export const deleteVariable = ({ dispatch, state }, variable) => {
+  dispatch('requestDeleteVariable');
+
+  const destroy = true;
+
+  return axios
+    .patch(state.endpoint, { variables_attributes: [prepareDataForApi(variable, destroy)] })
+    .then(() => {
+      dispatch('receiveDeleteVariableSuccess');
+      dispatch('fetchVariables');
+    })
+    .catch(error => {
+      createFlash(error.response.data[0]);
+      dispatch('receiveDeleteVariableError', error);
+    });
+};
+
+export const requestEnvironments = ({ commit }) => {
+  commit(types.REQUEST_ENVIRONMENTS);
+};
+
+export const receiveEnvironmentsSuccess = ({ commit }, environments) => {
+  commit(types.RECEIVE_ENVIRONMENTS_SUCCESS, environments);
+};
+
+export const fetchEnvironments = ({ dispatch, state }) => {
+  dispatch('requestEnvironments');
+
+  return Api.environments(state.projectId)
+    .then(res => {
+      dispatch('receiveEnvironmentsSuccess', prepareEnvironments(res.data));
+    })
+    .catch(() => {
+      createFlash(__('There was an error fetching the environments information.'));
+    });
+};

app/assets/javascripts/ci_variable_list/store/index.js

+import Vue from 'vue';
+import Vuex from 'vuex';
+import * as actions from './actions';
+import mutations from './mutations';
+import state from './state';
+
+Vue.use(Vuex);
+
+export default (initialState = {}) =>
+  new Vuex.Store({
+    actions,
+    mutations,
+    state: {
+      ...state(),
+      ...initialState,
+    },
+  });

app/assets/javascripts/ci_variable_list/store/mutation_types.js

+export const TOGGLE_VALUES = 'TOGGLE_VALUES';
+export const VARIABLE_BEING_EDITED = 'VARIABLE_BEING_EDITED';
+export const RESET_EDITING = 'RESET_EDITING';
+export const CLEAR_MODAL = 'CLEAR_MODAL';
+
+export const REQUEST_VARIABLES = 'REQUEST_VARIABLES';
+export const RECEIVE_VARIABLES_SUCCESS = 'RECEIVE_VARIABLES_SUCCESS';
+
+export const REQUEST_DELETE_VARIABLE = 'REQUEST_DELETE_VARIABLE';
+export const RECEIVE_DELETE_VARIABLE_SUCCESS = 'RECEIVE_DELETE_VARIABLE_SUCCESS';
+export const RECEIVE_DELETE_VARIABLE_ERROR = 'RECEIVE_DELETE_VARIABLE_ERROR';
+
+export const REQUEST_ADD_VARIABLE = 'REQUEST_ADD_VARIABLE';
+export const RECEIVE_ADD_VARIABLE_SUCCESS = 'RECEIVE_ADD_VARIABLE_SUCCESS';
+export const RECEIVE_ADD_VARIABLE_ERROR = 'RECEIVE_ADD_VARIABLE_ERROR';
+
+export const REQUEST_UPDATE_VARIABLE = 'REQUEST_UPDATE_VARIABLE';
+export const RECEIVE_UPDATE_VARIABLE_SUCCESS = 'RECEIVE_UPDATE_VARIABLE_SUCCESS';
+export const RECEIVE_UPDATE_VARIABLE_ERROR = 'RECEIVE_UPDATE_VARIABLE_ERROR';
+
+export const REQUEST_ENVIRONMENTS = 'REQUEST_ENVIRONMENTS';
+export const RECEIVE_ENVIRONMENTS_SUCCESS = 'RECEIVE_ENVIRONMENTS_SUCCESS';

app/assets/javascripts/ci_variable_list/store/mutations.js

+import * as types from './mutation_types';
+import { __ } from '~/locale';
+
+export default {
+  [types.REQUEST_VARIABLES](state) {
+    state.isLoading = true;
+  },
+
+  [types.RECEIVE_VARIABLES_SUCCESS](state, variables) {
+    state.isLoading = false;
+    state.variables = variables;
+  },
+
+  [types.REQUEST_DELETE_VARIABLE](state) {
+    state.isDeleting = true;
+  },
+
+  [types.RECEIVE_DELETE_VARIABLE_SUCCESS](state) {
+    state.isDeleting = false;
+  },
+
+  [types.RECEIVE_DELETE_VARIABLE_ERROR](state, error) {
+    state.isDeleting = false;
+    state.error = error;
+  },
+
+  [types.REQUEST_ADD_VARIABLE](state) {
+    state.isLoading = true;
+  },
+
+  [types.RECEIVE_ADD_VARIABLE_SUCCESS](state) {
+    state.isLoading = false;
+  },
+
+  [types.RECEIVE_ADD_VARIABLE_ERROR](state, error) {
+    state.isLoading = false;
+    state.error = error;
+  },
+
+  [types.REQUEST_UPDATE_VARIABLE](state) {
+    state.isLoading = true;
+  },
+
+  [types.RECEIVE_UPDATE_VARIABLE_SUCCESS](state) {
+    state.isLoading = false;
+  },
+
+  [types.RECEIVE_UPDATE_VARIABLE_ERROR](state, error) {
+    state.isLoading = false;
+    state.error = error;
+  },
+
+  [types.TOGGLE_VALUES](state, valueState) {
+    state.valuesHidden = valueState;
+  },
+
+  [types.REQUEST_ENVIRONMENTS](state) {
+    state.isLoading = true;
+  },
+
+  [types.RECEIVE_ENVIRONMENTS_SUCCESS](state, environments) {
+    state.isLoading = false;
+    state.environments = environments;
+    state.environments.unshift(__('All environments'));
+  },
+
+  [types.VARIABLE_BEING_EDITED](state, variable) {
+    state.variableBeingEdited = variable;
+  },
+
+  [types.CLEAR_MODAL](state) {
+    state.variable = {
+      variable_type: __('Variable'),
+      key: '',
+      secret_value: '',
+      protected: false,
+      masked: false,
+      environment_scope: __('All environments'),
+    };
+  },
+
+  [types.RESET_EDITING](state) {
+    state.variableBeingEdited = null;
+    state.showInputValue = false;
+  },
+};

app/assets/javascripts/ci_variable_list/store/state.js

+import { __ } from '~/locale';
+
+export default () => ({
+  endpoint: null,
+  projectId: null,
+  isGroup: null,
+  maskableRegex: null,
+  isLoading: false,
+  isDeleting: false,
+  variable: {
+    variable_type: __('Variable'),
+    key: '',
+    secret_value: '',
+    protected: false,
+    masked: false,
+    environment_scope: __('All environments'),
+  },
+  variables: null,
+  valuesHidden: true,
+  error: null,
+  environments: [],
+  typeOptions: [__('Variable'), __('File')],
+  variableBeingEdited: null,
+});

app/assets/javascripts/ci_variable_list/store/utils.js

+import { __ } from '~/locale';
+
+const variableType = 'env_var';
+const fileType = 'file';
+
+const variableTypeHandler = type => (type === 'Variable' ? variableType : fileType);
+
+export const prepareDataForDisplay = variables => {
+  const variablesToDisplay = [];
+  variables.forEach(variable => {
+    const variableCopy = variable;
+    if (variableCopy.variable_type === variableType) {
+      variableCopy.variable_type = __('Variable');
+    } else {
+      variableCopy.variable_type = __('File');
+    }
+
+    if (variableCopy.environment_scope === '*') {
+      variableCopy.environment_scope = __('All environments');
+    }
+    variablesToDisplay.push(variableCopy);
+  });
+  return variablesToDisplay;
+};
+
+export const prepareDataForApi = (variable, destroy = false) => {
+  const variableCopy = variable;
+  variableCopy.protected.toString();
+  variableCopy.masked.toString();
+  variableCopy.variable_type = variableTypeHandler(variableCopy.variable_type);
+
+  if (variableCopy.environment_scope === __('All environments')) {
+    variableCopy.environment_scope = __('*');
+  }
+
+  if (destroy) {
+    // eslint-disable-next-line
+    variableCopy._destroy = destroy;
+  }
+
+  return variableCopy;
+};
+
+export const prepareEnvironments = environments => environments.map(e => e.name);

app/assets/stylesheets/framework/typography.scss

@@ -102,7 +102,6 @@
     padding-bottom: 0.3em;
     border-bottom: 1px solid $white-dark;
     color: $gl-text-color;
-    overflow: hidden;
     &:first-child {
       margin-top: 0;
@@ -116,7 +115,6 @@
     padding-bottom: 0.3em;
     border-bottom: 1px solid $white-dark;
     color: $gl-text-color;
-    overflow: hidden;
   }
   h3 {

app/workers/admin_email_worker.rb

@@ -7,7 +7,7 @@ class AdminEmailWorker
   include CronjobQueue
   # rubocop:enable Scalability/CronWorkerContext
-  feature_category_not_owned!
+  feature_category :source_code_management
   def perform
     send_repository_check_mail if Gitlab::CurrentSettings.repository_checks_enabled

app/workers/all_queues.yml

@@ -58,7 +58,7 @@
   :resource_boundary: :unknown
   :weight: 1
 - :name: cronjob:admin_email
-  :feature_category: :not_owned
+  :feature_category: :source_code_management
   :has_external_dependencies: 
   :latency_sensitive: 
   :resource_boundary: :unknown
@@ -88,7 +88,7 @@
   :resource_boundary: :unknown
   :weight: 1
 - :name: cronjob:gitlab_usage_ping
-  :feature_category: :not_owned
+  :feature_category: :collection
   :has_external_dependencies: 
   :latency_sensitive: 
   :resource_boundary: :unknown
@@ -142,7 +142,7 @@
   :resource_boundary: :cpu
   :weight: 1
 - :name: cronjob:prune_old_events
-  :feature_category: :not_owned
+  :feature_category: :users
   :has_external_dependencies: 
   :latency_sensitive: 
   :resource_boundary: :unknown

app/workers/gitlab_usage_ping_worker.rb

@@ -9,7 +9,7 @@ class GitlabUsagePingWorker
   include CronjobQueue
   # rubocop:enable Scalability/CronWorkerContext
-  feature_category_not_owned!
+  feature_category :collection
   # Retry for up to approximately three hours then give up.
   sidekiq_options retry: 10, dead: false

app/workers/prune_old_events_worker.rb

@@ -7,7 +7,7 @@ class PruneOldEventsWorker
   include CronjobQueue
   # rubocop:enable Scalability/CronWorkerContext
-  feature_category_not_owned!
+  feature_category :users
   DELETE_LIMIT = 10_000

changelogs/unreleased/27142-divider-in-readme-is-overlaying-with-image.yml

----
-title: Do not draw heading borders over floated images in markdown
-merge_request:
-author: Gwen_
-type: fixed

doc/administration/packages/container_registry.md

@@ -619,7 +619,7 @@ provided by `gitlab-ctl`.
 Consider the following example, where you first build the image:
-```bash
+```shell
 # This builds a image with content of sha256:111111
 docker build -t my.registry.com/my.group/my.project:latest .
 docker push my.registry.com/my.group/my.project:latest
@@ -627,7 +627,7 @@ docker push my.registry.com/my.group/my.project:latest
 Now, you do overwrite `:latest` with a new version:
-```bash
+```shell
 # This builds a image with content of sha256:222222
 docker build -t my.registry.com/my.group/my.project:latest .
 docker push my.registry.com/my.group/my.project:latest
@@ -774,7 +774,7 @@ once a week.
 Create a file under `/etc/cron.d/registry-garbage-collect`:
-```bash
+```shell
 SHELL=/bin/sh
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin

doc/administration/server_hooks.md

@@ -88,11 +88,10 @@ pattern (`*~`).
 The hooks are searched and executed in this order:
-1. `gitlab-shell/hooks` directory as known to Gitaly.
-1. `<project>.git/hooks/<hook_name>` -  executed by `git` itself, this is symlinked to `gitlab-shell/hooks/<hook_name>`.
+1. Built-in GitLab server hooks (not user-customizable).
 1. `<project>.git/custom_hooks/<hook_name>` - per-project hook (this was kept as the already existing behavior).
 1. `<project>.git/custom_hooks/<hook_name>.d/*` - per-project hooks.
-1. `<project>.git/hooks/<hook_name>.d/*` OR `<custom_hooks_dir>/<hook_name.d>/*` - global hooks: all executable files (except editor backup files).
+1. `<custom_hooks_dir>/<hook_name>.d/*` - global hooks: all executable files (except editor backup files).
 The hooks of the same type are executed in order and execution stops on the
 first script exiting with a non-zero value.

doc/administration/troubleshooting/kubernetes_cheat_sheet.md

@@ -74,7 +74,7 @@ and they will assist you with any issues you are having.
 - How to get cronjobs configured on a cluster
-  ```bash
+  ```shell
   kubectl get cronjobs
   ```
   

doc/api/protected_environments.md

@@ -17,7 +17,7 @@ Currently, these levels are recognized:
 Gets a list of protected environments from a project:
-```bash
+```shell
 GET /projects/:id/protected_environments
 ```
@@ -25,7 +25,7 @@ GET /projects/:id/protected_environments
 | --------- | ---- | -------- | ----------- |
 | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user. |
-```bash
+```shell
 curl --header "PRIVATE-TOKEN: <your_access_token>" 'https://gitlab.example.com/api/v4/projects/5/protected_environments/'
 ```
@@ -51,7 +51,7 @@ Example response:
 Gets a single protected environment:
-```bash
+```shell
 GET /projects/:id/protected_environments/:name
 ```
@@ -60,7 +60,7 @@ GET /projects/:id/protected_environments/:name
 | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
 | `name` | string | yes | The name of the protected environment |
-```bash
+```shell
 curl --header "PRIVATE-TOKEN: <your_access_token>" 'https://gitlab.example.com/api/v4/projects/5/protected_environments/production'
 ```
@@ -84,11 +84,11 @@ Example response:
 Protects a single environment:
-```bash
+```shell
 POST /projects/:id/protected_environments
 ```
-```bash
+```shell
 curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" 'https://gitlab.example.com/api/v4/projects/5/protected_environments?name=staging&deploy_access_levels%5B%5D%5Buser_id%5D=1'
 ```
@@ -122,11 +122,11 @@ Example response:
 Unprotects the given protected environment:
-```bash
+```shell
 DELETE /projects/:id/protected_environments/:name
 ```
-```bash
+```shell
 curl --request DELETE --header "PRIVATE-TOKEN: <your_access_token>" 'https://gitlab.example.com/api/v4/projects/5/protected_environments/staging'
 ```

doc/ci/README.md

@@ -50,6 +50,7 @@ To get started with GitLab CI/CD, we recommend you read through
 the following documents:
 - [How GitLab CI/CD works](introduction/index.md#how-gitlab-cicd-works).
+- [Fundamental pipeline architectures](pipelines/pipeline_architectures.md).
 - [GitLab CI/CD basic workflow](introduction/index.md#basic-cicd-workflow).
 - [Step-by-step guide for writing `.gitlab-ci.yml` for the first time](../user/project/pages/getting_started_part_four.md).

doc/ci/docker/using_docker_images.md

@@ -397,7 +397,7 @@ Before the new extended Docker configuration options, you would need to create
 your own image based on the `super/sql:latest` image, add the default command,
 and then use it in job's configuration, like:
-```Dockerfile
+```dockerfile
 # my-super-sql:latest image's Dockerfile
 FROM super/sql:latest

doc/ci/examples/devops_and_game_dev_with_gitlab_ci_cd/index.md

@@ -63,7 +63,7 @@ Next, we'll create a small subset of tests that exemplify most of the states I e
 this `Weapon` class to go through. To get started, create a folder called `lib/tests`
 and add the following code to a new file `weaponTests.ts`:
-```ts
+```typescript
 import { expect } from 'chai';
 import { Weapon, BulletFactory } from '../lib/weapon';
@@ -114,7 +114,7 @@ describe('Weapon', () => {
 To build and run these tests using gulp, let's also add the following gulp functions
 to the existing `gulpfile.js` file:
-```ts
+```typescript
 gulp.task('build-test', function () {
     return gulp.src('src/tests/**/*.ts', { read: false })
     .pipe(tap(function (file) {
@@ -140,7 +140,7 @@ to trigger the weapon. In the `src/lib` folder create a `weapon.ts` file. We'll
 to it: `Weapon` and `BulletFactory` which will encapsulate Phaser's **sprite** and
 **group** objects, and the logic specific to our game.
-```ts
+```typescript
 export class Weapon {
     private isTriggered: boolean = false;
     private currentTimer: number = 0;
@@ -210,7 +210,7 @@ export class BulletFactory {
 Lastly, we'll redo our entry point, `game.ts`, to tie together both `Player` and `Weapon` objects
 as well as add them to the update loop. Here is what the updated `game.ts` file looks like:
-```ts
+```typescript
 import { Player } from "./player";
 import { Weapon, BulletFactory } from "./weapon";