summaryrefslogtreecommitdiff
path: root/doc/workflow/merge_requests.md
Commit message (Collapse)AuthorAgeFilesLines
* Move `workflow/merge_requests.md` to `user/project/merge_requests.md`Achilleas Pipinellis2016-09-051-90/+1
|
* Merge branch 'dz-merge-request-version'Douwe Maan2016-08-251-0/+8
|\
| * Add documentation for merge request versionsDmitriy Zaporozhets2016-08-121-0/+8
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | removed redundant wordJürgen Steinblock2016-08-251-1/+1
| |
* | Modify the alias to allow specifying a remoteOndřej Čertík2016-08-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | 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.
* | Add new lines after backticks and colonsOndřej Čertík2016-08-231-0/+4
| |
* | Update merge_requests.md with a simpler way to check out a merge request Ondřej Čertík2016-08-221-0/+15
|/ | | | | | | | | 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.
* Add documentation for the 'only_allow_merge_if_build_succeeds.rb' featureRémy Coutable2016-06-101-0/+11
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Update wordingAlfredo Sumaran2016-04-261-1/+1
|
* Add documentation for "Hide whitespace changes" buttonAlfredo Sumaran2016-04-261-3/+3
|
* Add ignore white space option in merge request diffMinsik Yoon2015-11-131-0/+12
| | | | | | fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393). Add ignore whitespace optoin to Commits Compare view
* Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-0/+40
| | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
* Revert "Merge branch 'improve-merge-requests' into 'master' "Dmitriy Zaporozhets2015-08-111-40/+0
| | | | | This reverts commit 4773f38e28c91dbbb6e5e385e0c403877298bfed, reversing changes made to 0d5d80b735eb18ae79eb2bfe26c08896d53db414.
* Link merge request doc to READMEimprove-merge-requestsDmitriy Zaporozhets2015-08-071-1/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Create ref for every merge request. Add documentation for fetch merge requestsDmitriy Zaporozhets2015-08-071-0/+41
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>