summaryrefslogtreecommitdiff
path: root/doc/user/project/merge_requests/img
Commit message (Expand)AuthorAgeFilesLines
* 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-051-0/+0
* Move "Only allow merge requests to be merged if the build succeeds" to new lo...Achilleas Pipinellis2016-09-052-0/+0
* Move revert_changes.md to new locationAchilleas Pipinellis2016-09-054-0/+0
* Move cherry_pick_changes.md to new locationAchilleas Pipinellis2016-09-054-0/+0
* Move `wip_merge_requests.md` to a new locationAchilleas Pipinellis2016-09-053-0/+0
* Move merge_when_build_succeeds.md to new locationAchilleas Pipinellis2016-09-052-0/+0
* Move `workflow/merge_requests.md` to `user/project/merge_requests.md`Achilleas Pipinellis2016-09-055-0/+0
* Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-172-0/+0
|\
| * Add merge conflict docsSean McGivern2016-08-122-0/+0
* Add documentation for discussion resolution.Connor Shea2016-08-164-0/+0