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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
fb59f55f
Commit
fb59f55f
authored
Sep 19, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix MR docs link to fast-forward section
parent
8e7b8815
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
3 deletions
+1
-3
doc/user/project/merge_requests/index.md
doc/user/project/merge_requests/index.md
+1
-3
No files found.
doc/user/project/merge_requests/index.md
View file @
fb59f55f
...
@@ -23,7 +23,7 @@ With GitLab merge requests, you can:
...
@@ -23,7 +23,7 @@ With GitLab merge requests, you can:
-
Organize your issues and merge requests consistently throughout the project with
[
labels
](
../../project/labels.md
)
-
Organize your issues and merge requests consistently throughout the project with
[
labels
](
../../project/labels.md
)
-
Add a time estimation and the time spent with that merge request with
[
Time Tracking
](
../../../workflow/time_tracking.html#time-tracking
)
-
Add a time estimation and the time spent with that merge request with
[
Time Tracking
](
../../../workflow/time_tracking.html#time-tracking
)
-
[
Resolve merge conflicts from the UI
](
#resolve-conflicts
)
-
[
Resolve merge conflicts from the UI
](
#resolve-conflicts
)
-
Enable
[
fast-forward merge requests
](
https://docs.gitlab.com/ce/user/project/merge_requests/fast_forward_merge.html
)
-
Enable
[
fast-forward merge requests
](
#fast-forward-merge-requests
)
With
**[GitLab Enterprise Edition][ee]**
, you can also:
With
**[GitLab Enterprise Edition][ee]**
, you can also:
...
@@ -92,8 +92,6 @@ in a merged merge requests or a commit.
...
@@ -92,8 +92,6 @@ in a merged merge requests or a commit.
## Fast-forward merge requests
## Fast-forward merge requests
> Included in [GitLab Enterprise Edition Starter][products].
If you prefer a linear Git history and a way to accept merge requests without
If you prefer a linear Git history and a way to accept merge requests without
creating merge commits, you can configure this on a per-project basis.
creating merge commits, you can configure this on a per-project basis.
...
...
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