diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/api/commits.md | 28 | ||||
-rw-r--r-- | doc/user/clusters/management_project.md | 17 |
2 files changed, 43 insertions, 2 deletions
diff --git a/doc/api/commits.md b/doc/api/commits.md index 3f2932f2666..f4bb09843c8 100644 --- a/doc/api/commits.md +++ b/doc/api/commits.md @@ -317,6 +317,21 @@ Example response: } ``` +In the event of a failed cherry-pick, the response will provide context about +why: + +```json +{ + "message": "Sorry, we cannot cherry-pick this commit automatically. This commit may already have been cherry-picked, or a more recent commit may have updated some of its content.", + "error_code": "empty" +} +``` + +In this case, the cherry-pick failed because the changeset was empty and likely +indicates that the commit already exists in the target branch. The other +possible error code is `conflict`, which indicates that there was a merge +conflict. + ## Revert a commit > [Introduced][ce-22919] in GitLab 11.5. @@ -358,6 +373,19 @@ Example response: } ``` +In the event of a failed revert, the response will provide context about why: + +```json +{ + "message": "Sorry, we cannot revert this commit automatically. This commit may already have been reverted, or a more recent commit may have updated some of its content.", + "error_code": "conflict" +} +``` + +In this case, the revert failed because the attempted revert generated a merge +conflict. The other possible error code is `empty`, which indicates that the +changeset was empty, likely due to the change having already been reverted. + ## Get the diff of a commit Get the diff of a commit in a project. diff --git a/doc/user/clusters/management_project.md b/doc/user/clusters/management_project.md index 6cee781ff3d..a052239448f 100644 --- a/doc/user/clusters/management_project.md +++ b/doc/user/clusters/management_project.md @@ -32,10 +32,23 @@ Management projects are restricted to the following: ## Usage +To use a cluster management project for a cluster: + +1. Select the project. +1. Configure your pipelines. +1. Set an environment scope. + ### Selecting a cluster management project -You can select a management project for the cluster under **Advanced -settings**. +To select a cluster management project to use: + +1. Navigate to the appropriate configuration page. For a: + - [Project-level cluster](../project/clusters/index.md), navigate to your project's + **Operations > Kubernetes** page. + - [Group-level cluster](../group/clusters/index.md), navigate to your group's **Kubernetes** + page. +1. Select the project using **Cluster management project field** in the **Advanced settings** + section. ![Selecting a cluster management project under Advanced settings](img/advanced-settings-cluster-management-project-v12_5.png) |