Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f92b468c
Commit
f92b468c
authored
Apr 15, 2021
by
Dmytro Zaporozhets (DZ)
Committed by
Craig Norris
Apr 15, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add docs for MR default target project feature
parent
702a96b4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
0 deletions
+22
-0
doc/user/project/merge_requests/creating_merge_requests.md
doc/user/project/merge_requests/creating_merge_requests.md
+21
-0
doc/user/project/settings/index.md
doc/user/project/settings/index.md
+1
-0
No files found.
doc/user/project/merge_requests/creating_merge_requests.md
View file @
f92b468c
...
@@ -172,6 +172,9 @@ create a merge request from your fork to contribute back to the main project:
...
@@ -172,6 +172,9 @@ create a merge request from your fork to contribute back to the main project:
1.
In the left menu, go to
**Merge Requests**
, and click
**New Merge Request**
.
1.
In the left menu, go to
**Merge Requests**
, and click
**New Merge Request**
.
1.
In the
**Source branch**
drop-down list box, select your branch in your forked repository as the source branch.
1.
In the
**Source branch**
drop-down list box, select your branch in your forked repository as the source branch.
1.
In the
**Target branch**
drop-down list box, select the branch from the upstream repository as the target branch.
1.
In the
**Target branch**
drop-down list box, select the branch from the upstream repository as the target branch.
You can set a
[
default target project
](
#set-the-default-target-project
)
to
change the default target branch (which can be useful when working with a
forked project).
1.
After entering the credentials, click
**Compare branches and continue**
to compare your local changes to the upstream repository.
1.
After entering the credentials, click
**Compare branches and continue**
to compare your local changes to the upstream repository.
1.
Assign a user to review your changes, and click
**Submit merge request**
.
1.
Assign a user to review your changes, and click
**Submit merge request**
.
...
@@ -183,6 +186,24 @@ fork from its upstream project in the **Settings > Advanced Settings** section b
...
@@ -183,6 +186,24 @@ fork from its upstream project in the **Settings > Advanced Settings** section b
For further details,
[
see the forking workflow documentation
](
../repository/forking_workflow.md
)
.
For further details,
[
see the forking workflow documentation
](
../repository/forking_workflow.md
)
.
## Set the default target project
Merge requests have a source and a target project which are the same, unless
forking is involved. Creating a fork of the project can cause either of these
scenarios when you create a new merge request:
-
You target an upstream project (the project you forked, and the default
option).
-
You target your own fork.
If you want to have merge requests from a fork by default target your own fork
(instead of the upstream project), you can change the default by:
1.
In your project, go to
**Settings > General > Merge requests**
.
1.
In the
**Target project**
section, select the option you want to use for
your default target project.
1.
Select
**Save changes**
.
## New merge request by email **(FREE SELF)**
## New merge request by email **(FREE SELF)**
_This feature needs [incoming email](../../../administration/incoming_
email.md)
_This feature needs [incoming email](../../../administration/incoming_
email.md)
...
...
doc/user/project/settings/index.md
View file @
f92b468c
...
@@ -214,6 +214,7 @@ Set up your project's merge request settings:
...
@@ -214,6 +214,7 @@ Set up your project's merge request settings:
-
Enable
[
merge only when all threads are resolved
](
../../discussions/index.md#only-allow-merge-requests-to-be-merged-if-all-threads-are-resolved
)
.
-
Enable
[
merge only when all threads are resolved
](
../../discussions/index.md#only-allow-merge-requests-to-be-merged-if-all-threads-are-resolved
)
.
-
Enable
[
`delete source branch after merge` option by default
](
../merge_requests/getting_started.md#deleting-the-source-branch
)
-
Enable
[
`delete source branch after merge` option by default
](
../merge_requests/getting_started.md#deleting-the-source-branch
)
-
Configure
[
suggested changes commit messages
](
../../discussions/index.md#configure-the-commit-message-for-applied-suggestions
)
-
Configure
[
suggested changes commit messages
](
../../discussions/index.md#configure-the-commit-message-for-applied-suggestions
)
-
Configure
[
the default target project
](
../merge_requests/creating_merge_requests.md#set-the-default-target-project
)
for merge requests coming from forks.
### Service Desk
### Service Desk
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment