diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-09-19 00:24:02 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-09-19 23:48:40 -0500 |
| commit | fab5567a09cffe4f070913ff3a2205ece0e31904 (patch) | |
| tree | 71f4eb9dc00af7909f68eb21671d0e56dcbe1693 | |
| parent | fb59f55f47c3b19c0cebcba319cbe89c8db3d509 (diff) | |
| download | gitlab-ce-fab5567a09cffe4f070913ff3a2205ece0e31904.tar.gz | |
Update fast-forward doc links to point at own docs
| -rw-r--r-- | doc/user/project/settings/index.md | 2 | ||||
| -rw-r--r-- | doc/workflow/README.md | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md index 22c343dc027..b7c7a5e5d28 100644 --- a/doc/user/project/settings/index.md +++ b/doc/user/project/settings/index.md @@ -23,7 +23,7 @@ Add an [issue description template](../description_templates.md#description-temp Set up your project's merge request settings: -- Set up the merge request method (merge commit, [fast-forward merge](https://docs.gitlab.com/ee/user/project/merge_requests/fast_forward_merge.html#fast-forward-merge-requests)). _Fast-forward is available in [GitLab Enterprise Edition Starter](https://about.gitlab.com/gitlab-ee/)._ +- Set up the merge request method (merge commit, [fast-forward merge](../merge_requests/fast_forward_merge.html)). - Merge request [description templates](../description_templates.md#description-templates). - Enable [merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html#merge-request-approvals), _available in [GitLab Enterprise Edition Starter](https://about.gitlab.com/gitlab-ee/)_. - Enable [merge only of pipeline succeeds](../merge_requests/merge_when_pipeline_succeeds.md). diff --git a/doc/workflow/README.md b/doc/workflow/README.md index 673e08287a3..6b2aba47f54 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -36,6 +36,7 @@ - [Revert changes in the UI](../user/project/merge_requests/revert_changes.md) - [Merge requests versions](../user/project/merge_requests/versions.md) - ["Work In Progress" merge requests](../user/project/merge_requests/work_in_progress_merge_requests.md) + - [Fast-forward merge requests](../user/project/merge_requests/fast_forward_merge.md) - [Manage large binaries with Git LFS](lfs/manage_large_binaries_with_git_lfs.md) - [Importing from SVN, GitHub, Bitbucket, etc](importing/README.md) - [Todos](todos.md) |