diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-28 06:06:30 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-28 06:06:30 +0000 |
| commit | 1a3d7b9fcda9e4eecd22b84f4254efc07344b284 (patch) | |
| tree | 9493ca4c9238b68080236720483e049fb2e1645b /doc/user/project/merge_requests | |
| parent | a87b80f74416208b8c46db328c5384d7ccbdecdd (diff) | |
| download | gitlab-ce-1a3d7b9fcda9e4eecd22b84f4254efc07344b284.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/merge_requests')
| -rw-r--r-- | doc/user/project/merge_requests/index.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index 00879aae931..97bd5dc3bc6 100644 --- a/doc/user/project/merge_requests/index.md +++ b/doc/user/project/merge_requests/index.md @@ -27,7 +27,7 @@ With GitLab merge requests, you can: - Assign it to any registered user, and change the assignee how many times you need - Assign a [milestone](../../project/milestones/index.md) and track the development of a broader implementation - 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.md#time-tracking) +- Add a time estimation and the time spent with that merge request with [Time Tracking](../time_tracking.md#time-tracking) - [Resolve merge conflicts from the UI](#resolve-conflicts) - Enable [fast-forward merge requests](#fast-forward-merge-requests) - Enable [semi-linear history merge requests](#semi-linear-history-merge-requests) as another security layer to guarantee the pipeline is passing in the target branch |