summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Amirault <ravlen@gmail.com>2018-06-20 04:36:27 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-06-22 12:06:36 +0200
commit66d17c5430e6b443ff84aa6a83dff859e06db997 (patch)
treed984e391818b188dcf0483c9bd3e4ad98a8b948e
parent70aa92ec66de2ce8729096a8c9545af7a2c6d47a (diff)
downloadgitlab-ce-66d17c5430e6b443ff84aa6a83dff859e06db997.tar.gz
Update squash_and_merge.md to fix link and description
(cherry picked from commit b5ea33397eb8d2c874662026b0e36aed7c41dbbc)
-rw-r--r--doc/user/project/merge_requests/squash_and_merge.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/user/project/merge_requests/squash_and_merge.md b/doc/user/project/merge_requests/squash_and_merge.md
index a6efe893853..2ec423dcf70 100644
--- a/doc/user/project/merge_requests/squash_and_merge.md
+++ b/doc/user/project/merge_requests/squash_and_merge.md
@@ -1,6 +1,6 @@
# Squash and merge
-> [Introduced][ee-1024] in [GitLab Starter][ee] 8.17, and in [GitLab CE][ce] [11.0][ce-18956].
+> [Introduced][ee-1024] in [GitLab Starter][ee] 8.17, and in [GitLab Core][ce] [11.0][ce-18956].
Combine all commits of your merge request into one and retain a clean history.
@@ -75,6 +75,6 @@ squashing can itself be considered equivalent to rebasing.
[squash-edit-form]: img/squash_edit_form.png
[squash-mr-widget]: img/squash_mr_widget.png
[ff-merge]: fast_forward_merge.md#enabling-fast-forward-merges
-[ce]: https://about.gitlab.com/products/
-[ee]: https://about.gitlab.com/products/
+[ce]: https://about.gitlab.com/pricing/
+[ee]: https://about.gitlab.com/pricing/
[revert]: revert_changes.md