diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/merge_requests.md | 12 | ||||
| -rw-r--r-- | doc/ci/yaml/README.md | 26 | ||||
| -rw-r--r-- | doc/user/project/repository/git_blame.md | 8 | ||||
| -rw-r--r-- | doc/user/project/service_desk.md | 2 |
4 files changed, 32 insertions, 16 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index d85310de159..3a00e862094 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -61,6 +61,12 @@ Parameters: | `in` | string | no | Modify the scope of the `search` attribute. `title`, `description`, or a string joining them with comma. Default is `title,description` | | `wip` | string | no | Filter merge requests against their `wip` status. `yes` to return *only* WIP merge requests, `no` to return *non* WIP merge requests | +NOTE: **Note:** +[Starting in GitLab 12.8](https://gitlab.com/gitlab-org/gitlab/issues/29984), +the mergeability (`merge_status`) of each merge request will be checked +asynchronously when a request is made to this endpoint. Poll this API endpoint +to get updated status. + ```json [ { @@ -526,6 +532,12 @@ Parameters: - `include_diverged_commits_count` (optional) - If `true` response includes the commits behind the target branch - `include_rebase_in_progress` (optional) - If `true` response includes whether a rebase operation is in progress +NOTE: **Note:** +[Starting in GitLab 12.8](https://gitlab.com/gitlab-org/gitlab/issues/29984), +the mergeability (`merge_status`) of a merge request will be checked +asynchronously when a request is made to this endpoint. Poll this API endpoint +to get updated status. + ```json { "id": 1, diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index aafbe4c9189..6f2ad341ce2 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -2103,7 +2103,7 @@ The `codequality` report collects [CodeQuality issues](../../user/project/merge_ as artifacts. The collected Code Quality report will be uploaded to GitLab as an artifact and will -be automatically shown in merge requests. +be summarized in merge requests. It is not available for download through the web interface. ##### `artifacts:reports:sast` **(ULTIMATE)** @@ -2113,8 +2113,8 @@ The `sast` report collects [SAST vulnerabilities](../../user/application_securit as artifacts. The collected SAST report will be uploaded to GitLab as an artifact and will -be automatically shown in merge requests, pipeline view and provide data for security -dashboards. +be summarized in the merge requests and pipeline view. It is also used to provide data for security +dashboards. It is not available for download through the web interface. ##### `artifacts:reports:dependency_scanning` **(ULTIMATE)** @@ -2124,8 +2124,8 @@ The `dependency_scanning` report collects [Dependency Scanning vulnerabilities]( as artifacts. The collected Dependency Scanning report will be uploaded to GitLab as an artifact and will -be automatically shown in merge requests, pipeline view and provide data for security -dashboards. +be summarized in the merge requests and pipeline view. It is also used to provide data for security +dashboards. It is not available for download through the web interface. ##### `artifacts:reports:container_scanning` **(ULTIMATE)** @@ -2135,8 +2135,8 @@ The `container_scanning` report collects [Container Scanning vulnerabilities](.. as artifacts. The collected Container Scanning report will be uploaded to GitLab as an artifact and will -be automatically shown in merge requests, pipeline view and provide data for security -dashboards. +be summarized in the merge requests and pipeline view. It is also used to provide data for security +dashboards. It is not available for download through the web interface. ##### `artifacts:reports:dast` **(ULTIMATE)** @@ -2146,8 +2146,8 @@ The `dast` report collects [DAST vulnerabilities](../../user/application_securit as artifacts. The collected DAST report will be uploaded to GitLab as an artifact and will -be automatically shown in merge requests, pipeline view and provide data for security -dashboards. +be summarized in the merge requests and pipeline view. It is also used to provide data for security +dashboards. It is not available for download through the web interface. ##### `artifacts:reports:license_management` **(ULTIMATE)** @@ -2157,8 +2157,8 @@ The `license_management` report collects [Licenses](../../user/application_secur as artifacts. The collected License Compliance report will be uploaded to GitLab as an artifact and will -be automatically shown in merge requests, pipeline view and provide data for security -dashboards. +be summarized in the merge requests and pipeline view. It is also used to provide data for security +dashboards. It is not available for download through the web interface. ##### `artifacts:reports:performance` **(PREMIUM)** @@ -2168,7 +2168,7 @@ The `performance` report collects [Performance metrics](../../user/project/merge as artifacts. The collected Performance report will be uploaded to GitLab as an artifact and will -be automatically shown in merge requests. +be automatically shown in merge requests. It is not available for download through the web interface. ##### `artifacts:reports:metrics` **(PREMIUM)** @@ -2178,7 +2178,7 @@ The `metrics` report collects [Metrics](../../ci/metrics_reports.md) as artifacts. The collected Metrics report will be uploaded to GitLab as an artifact and will -be automatically shown in merge requests. +be automatically shown in merge requests. It is not available for download through the web interface. ### `dependencies` diff --git a/doc/user/project/repository/git_blame.md b/doc/user/project/repository/git_blame.md index 4b645e4c4bc..1c63d73acdb 100644 --- a/doc/user/project/repository/git_blame.md +++ b/doc/user/project/repository/git_blame.md @@ -23,10 +23,14 @@ noted information: If you hover over a commit in the UI, you'll see a precise date and time for that commit. - +## Blame previous commit + +> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/19299) in GitLab 12.7. To see earlier revisions of a specific line, click **View blame prior to this change** -until you've found the changes you're interested in viewing. +until you've found the changes you're interested in viewing: + + ## Associated `git` command diff --git a/doc/user/project/service_desk.md b/doc/user/project/service_desk.md index e9fce474040..d0c32bafe19 100644 --- a/doc/user/project/service_desk.md +++ b/doc/user/project/service_desk.md @@ -69,7 +69,7 @@ Follow these steps to do so: have access to your GitLab instance. We recommend **putting this behind an alias** so it can be changed if needed, and **[enabling Akismet](../../integration/akismet.md)** on your GitLab instance to add spam checking to this service. Unblocked email spam would result in many spam - issues being created, and may disrupt your GitLab service. + issues being created. If you have [templates](description_templates.md) in your repository, you can optionally select one from the selector menu to append it to all Service Desk issues. |