summaryrefslogtreecommitdiff
path: root/doc/user/project/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Update merge request versions documentation with new screenshotsdz-improve-mr-versions-docDmitriy Zaporozhets2016-09-214-1/+5
* Add changelog entry and documentation for merge request versions compareDmitriy Zaporozhets2016-09-071-0/+6
* Refactor authorization_for_merge_requests.md21857-refactor-merge-requests-documentationAchilleas Pipinellis2016-09-051-16/+32
* Add links to new docs in merge_requests.md and workflow/README.mdAchilleas Pipinellis2016-09-052-0/+0
* Move merge request versions to its own documentAchilleas Pipinellis2016-09-052-0/+22
* Move "Only allow merge requests to be merged if the build succeeds" to new lo...Achilleas Pipinellis2016-09-053-0/+18
* Move revert_changes.md to new locationAchilleas Pipinellis2016-09-055-0/+64
* Move cherry_pick_changes.md to new locationAchilleas Pipinellis2016-09-055-0/+52
* Move `wip_merge_requests.md` to a new locationAchilleas Pipinellis2016-09-054-0/+17
* Move merge_when_build_succeeds.md to new locationAchilleas Pipinellis2016-09-053-0/+28
* Move authorization_for_merge_requests.md to new locationAchilleas Pipinellis2016-09-051-0/+40
* Move `workflow/merge_requests.md` to `user/project/merge_requests.md`Achilleas Pipinellis2016-09-055-0/+0
* Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-dataSean McGivern2016-08-251-0/+1
* Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-173-0/+41
|\
| * Reference the version 'UI resolve conflicts' was introducedAchilleas Pipinellis2016-08-171-0/+4
| * Add merge conflict docsSean McGivern2016-08-123-0/+37
* Add documentation for discussion resolution.Connor Shea2016-08-166-8/+40
* Init commit on documentation for resolving inline comments in MRsAchilleas Pipinellis2016-08-171-0/+8