summaryrefslogtreecommitdiff
path: root/doc/workflow
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-09-05 13:46:37 +0200
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-09-05 13:46:37 +0200
commita8ba5840e0c86f3fb72cf81940674698e02ed025 (patch)
tree81b27635fa87432bbae5c79f36cba04c64017cae /doc/workflow
parent14a96a1ad2d96078cbd73a60e260601f47373060 (diff)
downloadgitlab-ce-a8ba5840e0c86f3fb72cf81940674698e02ed025.tar.gz
Move revert_changes.md to new location
Diffstat (limited to 'doc/workflow')
-rw-r--r--doc/workflow/img/revert_changes_commit.pngbin233750 -> 0 bytes
-rw-r--r--doc/workflow/img/revert_changes_commit_modal.pngbin205046 -> 0 bytes
-rw-r--r--doc/workflow/img/revert_changes_mr.pngbin241051 -> 0 bytes
-rw-r--r--doc/workflow/img/revert_changes_mr_modal.pngbin211022 -> 0 bytes
-rw-r--r--doc/workflow/revert_changes.md65
5 files changed, 1 insertions, 64 deletions
diff --git a/doc/workflow/img/revert_changes_commit.png b/doc/workflow/img/revert_changes_commit.png
deleted file mode 100644
index e7194fc3504..00000000000
--- a/doc/workflow/img/revert_changes_commit.png
+++ /dev/null
Binary files differ
diff --git a/doc/workflow/img/revert_changes_commit_modal.png b/doc/workflow/img/revert_changes_commit_modal.png
deleted file mode 100644
index c660ec7eaec..00000000000
--- a/doc/workflow/img/revert_changes_commit_modal.png
+++ /dev/null
Binary files differ
diff --git a/doc/workflow/img/revert_changes_mr.png b/doc/workflow/img/revert_changes_mr.png
deleted file mode 100644
index 3002f0ac1c5..00000000000
--- a/doc/workflow/img/revert_changes_mr.png
+++ /dev/null
Binary files differ
diff --git a/doc/workflow/img/revert_changes_mr_modal.png b/doc/workflow/img/revert_changes_mr_modal.png
deleted file mode 100644
index c6aaeecc8a6..00000000000
--- a/doc/workflow/img/revert_changes_mr_modal.png
+++ /dev/null
Binary files differ
diff --git a/doc/workflow/revert_changes.md b/doc/workflow/revert_changes.md
index 5ead9f4177f..cf1292253fc 100644
--- a/doc/workflow/revert_changes.md
+++ b/doc/workflow/revert_changes.md
@@ -1,64 +1 @@
-# Reverting changes
-
-> [Introduced][ce-1990] in GitLab 8.5.
-
----
-
-GitLab implements Git's powerful feature to [revert any commit][git-revert]
-with introducing a **Revert** button in Merge Requests and commit details.
-
-## Reverting a Merge Request
-
-_**Note:** 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._
-
-After the Merge Request has been merged, a **Revert** button will be available
-to revert the changes introduced by that Merge Request:
-
-![Revert Merge Request](img/revert_changes_mr.png)
-
----
-
-You can revert the changes directly into the selected branch or you can opt to
-create a new Merge Request with the revert changes:
-
-![Revert Merge Request modal](img/revert_changes_mr_modal.png)
-
----
-
-After the Merge Request has been reverted, the **Revert** button will not be
-available anymore.
-
-## Reverting a Commit
-
-You can revert a Commit from the Commit details page:
-
-![Revert commit](img/revert_changes_commit.png)
-
----
-
-Similar to reverting a Merge Request, you can opt to revert the changes
-directly into the target branch or create a new Merge Request to revert the
-changes:
-
-![Revert commit modal](img/revert_changes_commit_modal.png)
-
----
-
-After the Commit has been reverted, the **Revert** button will not be available
-anymore.
-
-Please note that when reverting merge commits, the mainline will always be the
-first parent. If you want to use a different mainline then you need to do that
-from the command line.
-
-Here is a quick example to revert a merge commit using the second parent as the
-mainline:
-
-```bash
-git revert -m 2 7a39eb0
-```
-
-[ce-1990]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1990 "Revert button Merge Request"
-[git-revert]: https://git-scm.com/docs/git-revert "Git revert documentation"
+This document was moved to [user/project/merge_requests/revert_changes](../user/project/merge_requests/revert_changes.md).