diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2019-01-30 10:00:24 +0000 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-01-30 10:00:24 +0000 |
commit | ebb90a09f8579d7e414401cddba43e5676d42173 (patch) | |
tree | d3102d4b665c87519c200159803e29067c08de3a | |
parent | 4dd8740c8afc7039a15237358474b689b6a12308 (diff) | |
parent | 6a31bd93d504a9c3aa00f431d61309fdc04c614e (diff) | |
download | gitlab-ce-ebb90a09f8579d7e414401cddba43e5676d42173.tar.gz |
Merge branch '25569-changing-wording-to-delete-when-referring-to-removing-a-branch--docs' into 'master'
Change `remove branch` to `delete branch`
Closes #25569
See merge request gitlab-org/gitlab-ce!24574
-rw-r--r-- | doc/user/project/merge_requests/index.md | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index 2c8a590fc45..b4f5a72e148 100644 --- a/doc/user/project/merge_requests/index.md +++ b/doc/user/project/merge_requests/index.md @@ -76,10 +76,10 @@ You can [search and filter the results](../../search/index.md#issues-and-merge-r ![Group Issues list view](img/group_merge_requests_list_view.png) -## Removing the source branch +## Deleting the source branch -When creating a merge request, select the "Remove source branch when merge -request accepted" option and the source branch will be removed when the merge +When creating a merge request, select the "Delete source branch when merge +request accepted" option and the source branch will be deleted when the merge request is merged. This option is also visible in an existing merge request next to the merge @@ -87,10 +87,10 @@ request button and can be selected/deselected before merging. It's only visible to users with [Maintainer permissions](../../permissions.md) in the source project. If the user viewing the merge request does not have the correct permissions to -remove the source branch and the source branch is set for removal, the merge -request widget will show the "Removes source branch" text. +delete the source branch and the source branch is set for deletion, the merge +request widget will show the "Deletes source branch" text. -![Remove source branch status](img/remove_source_branch_status.png) +![Delete source branch status](img/remove_source_branch_status.png) ## Allow collaboration on merge requests across forks |