diff options
Diffstat (limited to 'doc/user/project')
-rw-r--r-- | doc/user/project/clusters/kubernetes_pod_logs.md | 4 | ||||
-rw-r--r-- | doc/user/project/issues/design_management.md | 13 | ||||
-rw-r--r-- | doc/user/project/releases/index.md | 32 | ||||
-rw-r--r-- | doc/user/project/web_ide/img/commit_changes_v12_3.png | bin | 196689 -> 0 bytes | |||
-rw-r--r-- | doc/user/project/web_ide/img/commit_changes_v12_9.png | bin | 0 -> 681399 bytes | |||
-rw-r--r-- | doc/user/project/web_ide/index.md | 29 |
6 files changed, 50 insertions, 28 deletions
diff --git a/doc/user/project/clusters/kubernetes_pod_logs.md b/doc/user/project/clusters/kubernetes_pod_logs.md index f1899c7b8d9..709eefe07dd 100644 --- a/doc/user/project/clusters/kubernetes_pod_logs.md +++ b/doc/user/project/clusters/kubernetes_pod_logs.md @@ -46,13 +46,15 @@ Logs can be displayed by clicking on a specific pod from [Deploy Boards](../depl ### Logs view -The logs view will contain the last 500 lines for a pod, and has control to filter through: +The logs view lets you filter the logs by: - Pods. - [From GitLab 12.4](https://gitlab.com/gitlab-org/gitlab/issues/5769), environments. - [From GitLab 12.7](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/21656), [full text search](#full-text-search). - [From GitLab 12.8](https://gitlab.com/gitlab-org/gitlab/issues/197879), dates. +Loading more than 500 log lines is possible from [GitLab 12.9](https://gitlab.com/gitlab-org/gitlab/-/issues/198050) onwards. + Support for pods with multiple containers is coming [in a future release](https://gitlab.com/gitlab-org/gitlab/issues/13404). Support for historical data is coming [in a future release](https://gitlab.com/gitlab-org/gitlab/issues/196191). diff --git a/doc/user/project/issues/design_management.md b/doc/user/project/issues/design_management.md index 79ad6efd150..ba9796dc785 100644 --- a/doc/user/project/issues/design_management.md +++ b/doc/user/project/issues/design_management.md @@ -77,17 +77,18 @@ Navigate to the **Design Management** page from any issue by clicking the **Desi To upload design images, click the **Upload Designs** button and select images to upload. -Designs with the same filename as an existing uploaded design will create a new version -of the design, and will replace the previous version. - -Designs cannot be added if the issue has been moved, or its -[discussion is locked](../../discussions/#lock-discussions). - [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/34353) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.9, you can drag and drop designs onto the dedicated dropzone to upload them. ![Drag and drop design uploads](img/design_drag_and_drop_uploads_v12_9.png) +Designs with the same filename as an existing uploaded design will create a new version +of the design, and will replace the previous version. [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/34353) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.9, dropping a design on an existing uploaded design will also create a new version, +provided the filenames are the same. + +Designs cannot be added if the issue has been moved, or its +[discussion is locked](../../discussions/#lock-discussions). + ### Skipped designs Designs with the same filename as an existing uploaded design _and_ whose content has not changed will be skipped. diff --git a/doc/user/project/releases/index.md b/doc/user/project/releases/index.md index 85da9d9be43..d8935cd7e30 100644 --- a/doc/user/project/releases/index.md +++ b/doc/user/project/releases/index.md @@ -16,13 +16,6 @@ GitLab's **Releases** are a way to track deliverables in your project. Consider a snapshot in time of the source, build output, artifacts, and other metadata associated with a released version of your code. -There are several ways to create a Release: - -- In the interface, when you create a new Git tag. -- In the interface, by adding a release note to an existing Git tag. -- Using the [Releases API](../../../api/releases/index.md): we recommend doing this as one of the last - steps in your CI/CD release pipeline. - ## Getting started with Releases Start by giving a [description](#release-description) to the Release and @@ -117,7 +110,7 @@ it takes you to the list of Releases. ![Number of Releases](img/releases_count_v12_8.png "Incremental counter of Releases") For private projects, the number of Releases is displayed to users with Reporter -[permissions](../../permissions.md#releases-permissions) or higher. For public projects, +[permissions](../../permissions.md#project-members-permissions) or higher. For public projects, it is displayed to every user regardless of their permission level. ### Upcoming Releases @@ -130,6 +123,29 @@ Release tag. Once the `released_at` date and time has passed, the badge is autom ![An upcoming release](img/upcoming_release_v12_7.png) +## Creating a Release + +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/32812) in GitLab + 12.9, Releases can be created directly through the GitLab Releases UI. + +NOTE: **Note:** +Only users with Developer permissions or higher can create Releases. +Read more about [Release permissions](../../../user/permissions.md#project-members-permissions). + +To create a new Release through the GitLab UI: + +1. Navigate to **Project overview > Releases** and click the **New release** button. +1. On the **New Tag** page, fill out the tag details. +1. Optionally, in the **Release notes** field, enter the Release's description. + If you leave this field empty, only a tag will be created. + If you populate it, both a tag and a Release will be created. +1. Click **Create tag**. + +If you created a release, you can view it at **Project overview > Releases**. + +You can also create a Release using the [Releases API](../../../api/releases/index.md#create-a-release): +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. diff --git a/doc/user/project/web_ide/img/commit_changes_v12_3.png b/doc/user/project/web_ide/img/commit_changes_v12_3.png Binary files differdeleted file mode 100644 index e7dffbc7655..00000000000 --- a/doc/user/project/web_ide/img/commit_changes_v12_3.png +++ /dev/null diff --git a/doc/user/project/web_ide/img/commit_changes_v12_9.png b/doc/user/project/web_ide/img/commit_changes_v12_9.png Binary files differnew file mode 100644 index 00000000000..48491360626 --- /dev/null +++ b/doc/user/project/web_ide/img/commit_changes_v12_9.png diff --git a/doc/user/project/web_ide/index.md b/doc/user/project/web_ide/index.md index ba4eaf9f9b1..aeffd21d48c 100644 --- a/doc/user/project/web_ide/index.md +++ b/doc/user/project/web_ide/index.md @@ -43,30 +43,33 @@ you can find a more complete list of supported languages in the NOTE: **Note:** Single file editing is based on the [Ace Editor](https://ace.c9.io). -## Stage and commit changes +## Commit changes -After making your changes, click the **Commit** button in the bottom left to -review the list of changed files. If you're using GitLab 12.6 or older versions, -click on each file to review the changes and tick the item to stage a file. +> - [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/4539) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.4 and [brought to GitLab Core](https://gitlab.com/gitlab-org/gitlab-foss/issues/44157) in 10.7. +> - From [GitLab 12.7 onwards](https://gitlab.com/gitlab-org/gitlab/issues/33441), +files were automatically staged. +> - From [GitLab 12.9 onwards](https://gitlab.com/gitlab-org/gitlab/-/issues/196609), support for staging files was removed +to prevent loss of unstaged data. All your current changes necessarily have to be +committed or discarded. -From [GitLab 12.7 onward](https://gitlab.com/gitlab-org/gitlab/issues/33441), -all your files will be automatically staged. You still have the option to unstage -changes in case you want to submit them in multiple smaller commits. To unstage -a change, simply click the **Unstage** button when a staged file is open, or click -the undo icon next to **Staged changes** to unstage all changes. +After making your changes, click the **Commit** button on the bottom-left to +review the list of changed files. Once you have finalized your changes, you can add a commit message, commit the -staged changes and directly create a merge request. In case you don't have write +changes and directly create a merge request. In case you don't have write access to the selected branch, you will see a warning, but still be able to create a new branch and start a merge request. -![Commit changes](img/commit_changes_v12_3.png) +To discard a change in a particular file, click the **Discard changes** button on that +file in the changes tab. To discard all the changes, click the trash icon on the +top-right corner of the changes sidebar. + +![Commit changes](img/commit_changes_v12_9.png) ## Reviewing changes Before you commit your changes, you can compare them with the previous commit -by switching to the review mode or selecting the file from the staged files -list. +by switching to the review mode or selecting the file from the list of changes. An additional review mode is available when you open a merge request, which shows you a preview of the merge request diff if you commit your changes. |