Commit graph

17 commits

Author SHA1 Message Date
Marcel Amirault
8c58e7dedb Docs: Add missing redirects to /workflow and /articles docs 2019-03-26 13:21:47 +00:00
lulalala
19c6391134 Update doc redirect link 2018-05-17 08:54:45 +08:00
Achilleas Pipinellis
7973a22ff4 Move workflow/merge_requests.md to user/project/merge_requests.md 2016-09-05 12:13:11 +02:00
Douwe Maan
bbd9a6fe40 Merge branch 'dz-merge-request-version' 2016-08-25 12:59:21 -05:00
Jürgen Steinblock
89fcdbe84c removed redundant word 2016-08-25 04:56:48 +00:00
Ondřej Čertík
a7bd1c23dd Modify the alias to allow specifying a remote
Now the alias should be used as:

    git mr upstream 5

To check out a MR number 5 from the upstream remote, into a `mr-upstream-5`
local branch.

Also clarify that the `5` in the merge request is the number shown in GitLab.
2016-08-23 13:07:16 -06:00
Ondřej Čertík
d1ed0c76ec Add new lines after backticks and colons 2016-08-23 13:02:16 -06:00
Ondřej Čertík
eff3c35410 Update merge_requests.md with a simpler way to check out a merge request
The previous way was put under the
"By modifying `.git/config` for a given repository" section. The
disadvantage is that one has to modify `.git/config` for each repository
that one uses. The new way was put under the "By adding a git alias"
section. One has to create this git alias once, and then it will work
from any repository, without having to modify `.git/config` over and
over again.
2016-08-22 19:57:43 +00:00
Dmitriy Zaporozhets
a8fe213ebb
Add documentation for merge request versions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-12 15:40:00 +03:00
Rémy Coutable
282674c110 Add documentation for the 'only_allow_merge_if_build_succeeds.rb' feature
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-10 14:36:57 +02:00
Alfredo Sumaran
0392dffdb6 Update wording 2016-04-26 14:01:40 -05:00
Alfredo Sumaran
5d5df26ab1 Add documentation for "Hide whitespace changes" button 2016-04-26 14:01:40 -05:00
Minsik Yoon
3d0efa8e0a Add ignore white space option in merge request diff
fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393).

Add ignore whitespace optoin to Commits Compare view
2015-11-13 16:53:53 +09:00
Dmitriy Zaporozhets
3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' "
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets
84727fba96 Revert "Merge branch 'improve-merge-requests' into 'master' "
This reverts commit 4773f38e28, reversing
changes made to 0d5d80b735.
2015-08-11 10:26:19 +02:00
Dmitriy Zaporozhets
3c5ef17975
Link merge request doc to README
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-07 13:07:03 +02:00
Dmitriy Zaporozhets
86bccb71a1
Create ref for every merge request. Add documentation for fetch merge requests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-07 12:54:58 +02:00