diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 15:08:01 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 15:08:01 +0000 |
commit | b375c6c05fbd03aea33a9ee9f82e678bdaa8c3cc (patch) | |
tree | 55f2a32e5fd3d67597fc8c6cc2a01793ee15c87a /doc/user/project/repository | |
parent | 988b28ec1a379d38f6ac9ed04886ee564fd447fd (diff) | |
download | gitlab-ce-b375c6c05fbd03aea33a9ee9f82e678bdaa8c3cc.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/repository')
-rw-r--r-- | doc/user/project/repository/web_editor.md | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/doc/user/project/repository/web_editor.md b/doc/user/project/repository/web_editor.md index 0e47bf2c902..f1947066279 100644 --- a/doc/user/project/repository/web_editor.md +++ b/doc/user/project/repository/web_editor.md @@ -75,7 +75,7 @@ ready. To keep files in the repository organized it is often helpful to create a new directory. -From a project's files page, click the '+' button to the right of the branch selector. +From a project's files page, click the plus button (`+`) to the right of the branch selector. Choose **New directory** from the dropdown. ![New directory dropdown](img/web_editor_new_directory_dropdown.png) @@ -91,14 +91,21 @@ There are multiple ways to create a branch from GitLab's web interface. ### Create a new branch from an issue -> [Introduced][ce-2808] in GitLab 8.6. +> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/2808) in GitLab 8.6. + +If your development workflow dictates to have an issue for every merge +request, you can quickly create a branch directly from the issue to speed the process up. +The new branch, and later its merge request, will be marked as related to this issue. +Once merged, the MR will automatically close the issue. +You can see a **Create merge request** dropdown below the issue description. -In case your development workflow dictates to have an issue for every merge -request, you can quickly create a branch right on the issue page which will be -tied with the issue itself. You can see a **Create merge request** dropdown -below the issue description unless there is already a branch with the same -name or a referenced merge request or your project (still) has an active -[fork relationship](../settings/index.md#advanced-settings). +NOTE: **Note:** +You won't see the **Create merge request** button if there is already a branch with the same +name or a referenced merge request or your project has an active +fork relationship. +If you would like to make this button appear, a possible workaround is to [remove your project's +fork relationship](../settings/index.md#removing-a-fork-relationship). Once removed, the fork +relationship cannot be restored and you will no longer be able to send merge requests to the source. ![Create Button](img/web_editor_new_branch_from_issue_create_button_v12_6.png) @@ -181,8 +188,6 @@ If you'd prefer _not_ to use your primary email address for commits created through the web editor, you can choose to use another of your linked email addresses from the **User Settings > Edit Profile** page. -[ce-2808]: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/2808 - <!-- ## Troubleshooting Include any troubleshooting steps that you can foresee. If you know beforehand what issues |