diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 09:09:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 09:09:25 +0300 |
commit | 3d064c737e8448880e6180aeddc59000a01aa6a8 (patch) | |
tree | c97dcfe02e48426f96865068ffe8dcdd17bb1a96 /doc | |
parent | 7ba5b9babaa5802c39e686c57cbf4a3f4725c4b0 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/development/documentation/styleguide.md | 6 | ||||
-rw-r--r-- | doc/user/project/releases/img/edit_release_page_v12_10.png | bin | 0 -> 85295 bytes | |||
-rw-r--r-- | doc/user/project/releases/index.md | 15 |
3 files changed, 9 insertions, 12 deletions
diff --git a/doc/development/documentation/styleguide.md b/doc/development/documentation/styleguide.md index 8e9ff0fb218..370effc940c 100644 --- a/doc/development/documentation/styleguide.md +++ b/doc/development/documentation/styleguide.md @@ -757,10 +757,8 @@ To indicate the steps of navigation through the UI: the `.md` document that you're working on is located. - Images should have a specific, non-generic name that will differentiate and describe them properly. -- Always add to the end of the file name the GitLab release version - corresponding to the version the screenshot was taken from, using the format - `image_name_vX_Y.png`. - ([Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/61027) in GitLab 12.1.) +- For screenshots of GitLab software, append the GitLab version the screenshot was taken from to the + file name. Use the following format: `image_name_vX_Y.png`. - For example, for a screenshot taken from the pipelines page of GitLab 11.1, a valid name is `pipelines_v11_1.png`. If you're adding an illustration that does not include parts of the UI, diff --git a/doc/user/project/releases/img/edit_release_page_v12_10.png b/doc/user/project/releases/img/edit_release_page_v12_10.png Binary files differnew file mode 100644 index 00000000000..ebb12a549b7 --- /dev/null +++ b/doc/user/project/releases/img/edit_release_page_v12_10.png diff --git a/doc/user/project/releases/index.md b/doc/user/project/releases/index.md index 4a32644420f..37da3d0bb4a 100644 --- a/doc/user/project/releases/index.md +++ b/doc/user/project/releases/index.md @@ -183,7 +183,7 @@ we recommend doing this as one of the last steps in your CI/CD release pipeline. ## Editing a release -> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/26016) in GitLab 12.6. +> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/26016) in GitLab 12.6. Asset link editing was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/9427) in GitLab 12.10. To edit the details of a release, navigate to **Project overview > Releases** and click the edit button (pencil icon) in the top-right corner of the release you want to modify. @@ -193,14 +193,13 @@ the edit button (pencil icon) in the top-right corner of the release you want to This will bring you to the **Edit Release** page, from which you can change some of the release's details. -![Edit release page](img/edit_release_page_v12_6.png) +![Edit release page](img/edit_release_page_v12_10.png) -Currently, it is only possible to edit the release title and notes. -To change other release information, such as its tag, associated -milestones, or release date, use the -[Releases API](../../../api/releases/index.md#update-a-release). Editing this -information through the **Edit Release** page is planned for a future version -of GitLab. +Currently, it is only possible to edit the release title, notes, and asset +links. To change other release information, such as its tag, associated +milestones, or release date, use the [Releases +API](../../../api/releases/index.md#update-a-release). Editing this information +through the **Edit Release** page is planned for a future version of GitLab. ## Notification for Releases |