Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'doc/user/project')
-rw-r--r--doc/user/project/import/github.md2
-rw-r--r--doc/user/project/integrations/prometheus.md2
-rw-r--r--doc/user/project/releases/index.md29
-rw-r--r--doc/user/project/settings/import_export.md2
4 files changed, 23 insertions, 12 deletions
diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md
index 80b14c40e0a..ede2369dd3e 100644
--- a/doc/user/project/import/github.md
+++ b/doc/user/project/import/github.md
@@ -14,7 +14,7 @@ GitHub repositories using a [personal access token](#using-a-github-token),
but this method is not recommended because it cannot associate all user activity
(such as issues and pull requests) with matching GitLab users.
If you are an administrator of a self-managed GitLab instance, you can also use the
-[GitHub rake task](../../../administration/raketasks/github_import.md) to import projects from
+[GitHub Rake task](../../../administration/raketasks/github_import.md) to import projects from
GitHub without the constraints of a Sidekiq worker.
The following aspects of a project are imported:
diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md
index 86f00cdcc1c..b961478ea6d 100644
--- a/doc/user/project/integrations/prometheus.md
+++ b/doc/user/project/integrations/prometheus.md
@@ -882,7 +882,7 @@ If the "No data found" screen continues to appear, it could be due to:
are not labeled correctly. To test this, connect to the Prometheus server and
[run a query](prometheus_library/kubernetes.md#metrics-supported), replacing `$CI_ENVIRONMENT_SLUG`
with the name of your environment.
-- You may need to re-add the GitLab predefined common metrics. This can be done by running the [import common metrics rake task](../../../administration/raketasks/maintenance.md#import-common-metrics).
+- You may need to re-add the GitLab predefined common metrics. This can be done by running the [import common metrics Rake task](../../../administration/raketasks/maintenance.md#import-common-metrics).
[autodeploy]: ../../../topics/autodevops/index.md#auto-deploy
[kubernetes]: https://kubernetes.io
diff --git a/doc/user/project/releases/index.md b/doc/user/project/releases/index.md
index 53559ef1bb8..4a32644420f 100644
--- a/doc/user/project/releases/index.md
+++ b/doc/user/project/releases/index.md
@@ -244,16 +244,20 @@ You can also edit an existing tag to add release notes:
> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/26019) in GitLab 12.6.
-Each time a new release is created, specific related data is collected in
-parallel. This dataset will be a snapshot this new release (including linked
-milestones and issues) at moment of creation. Such collection of data will
-provide a chain of custody and facilitate processes like external audits, for example.
+Each time a release is created, GitLab takes a snapshot of data that's related to it.
+This data is called Release Evidence. It includes linked milestones and issues, and
+it is taken at moment the release is created. It provides a chain of custody and can
+facilitate processes like external audits, for example.
-The gathered evidence data is stored in the database upon creation of a new
-release as a JSON object. In GitLab 12.6, a link to
-the evidence data is provided for [each Release](#releases-list).
+You can also [use the API](../../../api/releases/index.md#collect-release-evidence-premium-only) to
+generate Release Evidence for an existing release. Because of this, [each release](#releases-list)
+can have multiple Release Evidence snapshots. You can view the Release Evidence and
+its details on the Release page.
-Here is what this object can look like:
+Release Evidence is stored as a JSON object, so you can compare evidence by using
+commonly-available tools.
+
+Here is an example of a Release Evidence object:
```json
{
@@ -319,7 +323,14 @@ Please note that Release Evidence's data is collected regardless of this
feature flag, which only enables or disables the display of the data on the
Releases page.
-### Scheduled Evidence creation
+### Collect release evidence **(PREMIUM ONLY)**
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/199065) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.10.
+
+Evidence collection can be initiated by using an [API call](../../../api/releases/index.md#collect-release-evidence-premium-only) at any time. Evidence snapshots are visible on
+the Release page, along with the timestamp the Evidence was collected.
+
+### Schedule release evidence collection
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23697) in GitLab 12.8.
diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md
index 9ff9f76dadb..04ad7b30aec 100644
--- a/doc/user/project/settings/import_export.md
+++ b/doc/user/project/settings/import_export.md
@@ -11,7 +11,7 @@ The **GitLab import/export** button is displayed if the project import option is
See also:
- [Project import/export API](../../../api/project_import_export.md)
-- [Project import/export administration rake tasks](../../../administration/raketasks/project_import_export.md) **(CORE ONLY)**
+- [Project import/export administration Rake tasks](../../../administration/raketasks/project_import_export.md) **(CORE ONLY)**
- [Group import/export API](../../../api/group_import_export.md)
To set up a project import/export: