summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorChristian Svensson <csvn.dev@gmail.com>2018-11-23 16:55:14 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-11-23 16:55:14 +0000
commit5cca95ec713868a1323b6f0ba77672422396f54a (patch)
tree7c5f19c7834a4bff20da6e3500fe2aeb33f28403 /doc
parent3250efaee949e146f0ac2bea9788aa8cf31b702f (diff)
downloadgitlab-ce-5cca95ec713868a1323b6f0ba77672422396f54a.tar.gz
Add docs note for Reverting MR availability
Diffstat (limited to 'doc')
-rw-r--r--doc/user/project/merge_requests/revert_changes.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/revert_changes.md b/doc/user/project/merge_requests/revert_changes.md
index 8cf8a59dbfe..b9102798a49 100644
--- a/doc/user/project/merge_requests/revert_changes.md
+++ b/doc/user/project/merge_requests/revert_changes.md
@@ -12,6 +12,12 @@ The **Revert** button will only be available for merge requests
created since GitLab 8.5. However, you can still revert a merge request
by reverting the merge commit from the list of Commits page.
+NOTE: **Note:**
+The **Revert** button will only be shown for projects that use the
+merge method "Merge Commit", which can be set under the project's
+**Settings > General > Merge request**. [Fast-forward commits](fast_forward_merge.md)
+can not be reverted via the MR view.
+
After the Merge Request has been merged, a **Revert** button will be available
to revert the changes introduced by that merge request.