summaryrefslogtreecommitdiff
path: root/doc/workflow
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-07 14:44:54 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-07 14:44:54 +0000
commit4773f38e28c91dbbb6e5e385e0c403877298bfed (patch)
tree586ae3380337aee5a757eee2134f22fb77844692 /doc/workflow
parent0d5d80b735eb18ae79eb2bfe26c08896d53db414 (diff)
parentfd2f907b0171c9c70b3a514d0452d2027980319e (diff)
downloadgitlab-ce-4773f38e28c91dbbb6e5e385e0c403877298bfed.tar.gz
Merge branch 'improve-merge-requests' into 'master'
Improve merge requests - [x] Fetch merge request refs by IID - [x] Ability to fetch any merge request - [x] Link commits and diffs in merge request to target project - [x] Improve merge request UI and command line instructions - [x] Check merge request widget loading test coverage double See merge request !1115
Diffstat (limited to 'doc/workflow')
-rw-r--r--doc/workflow/README.md1
-rw-r--r--doc/workflow/merge_requests.md40
2 files changed, 41 insertions, 0 deletions
diff --git a/doc/workflow/README.md b/doc/workflow/README.md
index 3915198ad2a..5b8d72dfd34 100644
--- a/doc/workflow/README.md
+++ b/doc/workflow/README.md
@@ -13,4 +13,5 @@
- [Project users](add-user/add-user.md)
- [Protected branches](protected_branches.md)
- [Web Editor](web_editor.md)
+- [Merge Requests](merge_requests.md)
- ["Work In Progress" Merge Requests](wip_merge_requests.md)
diff --git a/doc/workflow/merge_requests.md b/doc/workflow/merge_requests.md
new file mode 100644
index 00000000000..751e19da7f1
--- /dev/null
+++ b/doc/workflow/merge_requests.md
@@ -0,0 +1,40 @@
+# Merge Requests
+
+Merge requests allow you to exchange changes you made to source code
+
+## Checkout merge requests locally
+
+Locate the section for your GitLab remote in the `.git/config` file. It looks like this:
+
+```
+[remote "origin"]
+ url = https://gitlab.com/gitlab-org/gitlab-ce.git
+ fetch = +refs/heads/*:refs/remotes/origin/*
+```
+
+Now add the line `fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/*` to this section.
+
+It should looks like this:
+
+```
+[remote "origin"]
+ url = https://gitlab.com/gitlab-org/gitlab-ce.git
+ fetch = +refs/heads/*:refs/remotes/origin/*
+ fetch = +refs/merge-requests/*/head:refs/remotes/origin/merge-requests/*
+```
+
+Now you can fetch all the merge requests requests:
+
+```
+$ git fetch origin
+From https://gitlab.com/gitlab-org/gitlab-ce.git
+ * [new ref] refs/merge-requests/1/head -> origin/merge-requests/1
+ * [new ref] refs/merge-requests/2/head -> origin/merge-requests/2
+...
+```
+
+To check out a particular merge request:
+
+```
+$ git checkout origin/merge-requests/1
+```