diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-09 12:09:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-09 12:09:47 +0300 |
commit | 109562e64e1e1c51fe32a7443df86ee63b856115 (patch) | |
tree | f2d20105421b9a584243ebaa5d8a596958121094 /doc | |
parent | 47d41a24a1933599401d681675f1755c82adbbdf (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/ci/pipelines/settings.md | 3 | ||||
-rw-r--r-- | doc/ci/yaml/README.md | 16 | ||||
-rw-r--r-- | doc/development/experiment_guide/index.md | 13 | ||||
-rw-r--r-- | doc/update/upgrading_from_source.md | 11 | ||||
-rw-r--r-- | doc/user/application_security/security_dashboard/img/vulnerability_details_create_issue_v13_7.png | bin | 0 -> 86032 bytes | |||
-rw-r--r-- | doc/user/application_security/security_dashboard/img/vulnerability_page_v13_1.png | bin | 79341 -> 0 bytes | |||
-rw-r--r-- | doc/user/application_security/security_dashboard/index.md | 2 |
7 files changed, 27 insertions, 18 deletions
diff --git a/doc/ci/pipelines/settings.md b/doc/ci/pipelines/settings.md index ac6d492a29e..a346f5ccbc6 100644 --- a/doc/ci/pipelines/settings.md +++ b/doc/ci/pipelines/settings.md @@ -209,7 +209,8 @@ You can set pending or running pipelines to cancel automatically when a new pipe 1. Check the **Auto-cancel redundant, pending pipelines** checkbox. 1. Click **Save changes**. -Note that only jobs with [interruptible](../yaml/README.md#interruptible) set to `true` are cancelled. +Use the [`interruptible`](../yaml/README.md#interruptible) keyword to indicate if a +running job can be cancelled before it completes. ## Skip outdated deployment jobs diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index c6fa5db20f1..bd975b1f690 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -1417,7 +1417,7 @@ same rule. In the following example: -- If the `Dockerfile` file or any file in `/docker/scripts` has changed, and var=blah, +- If the `Dockerfile` file or any file in `/docker/scripts` has changed, and `$VAR` == "string value", then the job runs manually - Otherwise, the job isn't included in the pipeline. @@ -3655,19 +3655,19 @@ The trigger token is different than the [`trigger`](#trigger) keyword. > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/32022) in GitLab 12.3. -`interruptible` is used to indicate that a job should be canceled if made redundant by a newer pipeline run. Defaults to `false`. +`interruptible` is used to indicate that a running job should be canceled if made redundant by a newer pipeline run. +Defaults to `false` (uninterruptible). Jobs that have not started yet (pending) are considered interruptible +and safe to be cancelled. This value is used only if the [automatic cancellation of redundant pipelines feature](../pipelines/settings.md#auto-cancel-pending-pipelines) is enabled. -When enabled, a pipeline on the same branch is canceled when: +When enabled, a pipeline is immediately canceled when a new pipeline starts on the same branch if either of the following is true: -- It's made redundant by a newer pipeline run. -- Either all jobs are set as interruptible, or any uninterruptible jobs haven't started. +- All jobs in the pipeline are set as interruptible. +- Any uninterruptible jobs have not started yet. Set jobs as interruptible that can be safely canceled once started (for instance, a build job). -Pending jobs are always considered interruptible. - For example: ```yaml @@ -3699,7 +3699,7 @@ In the example above, a new pipeline run causes an existing running pipeline to - Canceled, if only `step-1` is running or pending. - Not canceled, once `step-2` starts running. -When an uninterruptible job is running, the pipeline can never be canceled, regardless of the final job's state. +When an uninterruptible job is running, the pipeline cannot be canceled, regardless of the final job's state. ### `resource_group` diff --git a/doc/development/experiment_guide/index.md b/doc/development/experiment_guide/index.md index 9e3b1d6f7be..4856675b2a2 100644 --- a/doc/development/experiment_guide/index.md +++ b/doc/development/experiment_guide/index.md @@ -324,6 +324,19 @@ For visibility, please also share any commands run against production in the `#s /chatops run feature delete signup_flow_experiment_percentage ``` +### Manually force the current user to be in the experiment group + +You may force the application to put your current user in the experiment group. To do so +add a query string parameter to the path where the experiment runs. If you do so, +the experiment will work only for this request and won't work after following links or submitting forms. + +For example, to forcibly enable the `EXPERIMENT_KEY` experiment, add `force_experiment=EXPERIMENT_KEY` +to the URL: + +```shell +https://gitlab.com/<EXPERIMENT_ENTRY_URL>?force_experiment=<EXPERIMENT_KEY> +``` + ### Testing and test helpers #### RSpec diff --git a/doc/update/upgrading_from_source.md b/doc/update/upgrading_from_source.md index eb3a85a257f..926595a1827 100644 --- a/doc/update/upgrading_from_source.md +++ b/doc/update/upgrading_from_source.md @@ -210,17 +210,12 @@ sudo -u git -H make build ### 10. Update GitLab Workhorse -Install and compile GitLab Workhorse. GitLab Workhorse uses -[GNU Make](https://www.gnu.org/software/make/). -If you are not using Linux you may have to run `gmake` instead of -`make` below. +Install and compile GitLab Workhorse. ```shell -cd /home/git/gitlab-workhorse +cd /home/git/gitlab -sudo -u git -H git fetch --all --tags --prune -sudo -u git -H git checkout v$(</home/git/gitlab/GITLAB_WORKHORSE_VERSION) -sudo -u git -H make +sudo -u git -H bundle exec rake "gitlab:workhorse:install[/home/git/gitlab-workhorse]" RAILS_ENV=production ``` ### 11. Update Gitaly diff --git a/doc/user/application_security/security_dashboard/img/vulnerability_details_create_issue_v13_7.png b/doc/user/application_security/security_dashboard/img/vulnerability_details_create_issue_v13_7.png Binary files differnew file mode 100644 index 00000000000..b9b228c9430 --- /dev/null +++ b/doc/user/application_security/security_dashboard/img/vulnerability_details_create_issue_v13_7.png diff --git a/doc/user/application_security/security_dashboard/img/vulnerability_page_v13_1.png b/doc/user/application_security/security_dashboard/img/vulnerability_page_v13_1.png Binary files differdeleted file mode 100644 index 9cf95b197fe..00000000000 --- a/doc/user/application_security/security_dashboard/img/vulnerability_page_v13_1.png +++ /dev/null diff --git a/doc/user/application_security/security_dashboard/index.md b/doc/user/application_security/security_dashboard/index.md index d656378e08d..2750aa81872 100644 --- a/doc/user/application_security/security_dashboard/index.md +++ b/doc/user/application_security/security_dashboard/index.md @@ -264,7 +264,7 @@ Clicking any vulnerability in the table takes you to its [Vulnerability Details](../vulnerabilities) page to see more information on that vulnerability. To create an issue associated with the vulnerability, click the **Create Issue** button. -![Create an issue for the vulnerability](img/vulnerability_page_v13_1.png) +![Create an issue for the vulnerability](img/vulnerability_details_create_issue_v13_7.png) Once you create the issue, the linked issue icon in the vulnerability list: |