summaryrefslogtreecommitdiff
path: root/doc/user/project/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* img/merge_request_diff_file_navigation.pngVictor Wu2017-08-221-0/+0
* Merge request diff file navigationVictor Wu2017-08-221-0/+8
* copyeditMarcia Ramos2017-08-211-8/+6
* Merge requests search and filteringVictor Wu2017-08-181-0/+251
* Update search and filter linksVictor Wu2017-08-181-249/+0
* Merge request list viewsVictor Wu2017-08-181-0/+16
* project_merge_requests_list_view.pngVictor Wu2017-08-181-0/+0
* group_merge_requests_list_view.pngVictor Wu2017-08-181-0/+0
* Update issue-related docsMarcia Ramos2017-07-161-1/+1
* add changes from EE-updatesdocs/overview-features-5Marcia Ramos2017-07-131-0/+64
* Refactor Discussions docsAchilleas Pipinellis2017-04-212-1/+2
* Started on resolvable discussions docsLuke "Jared" Bennett2017-04-2114-107/+1
* Replace the warning with an info iconBob Van Landuyt2017-03-132-0/+0
* Correctly indent quotes in new issue descriptionBob Van Landuyt2017-03-132-0/+0
* Add a button to delegate all discussions in a merge requestBob Van Landuyt2017-03-132-4/+10
* Delegate a single discussion to a new issueBob Van Landuyt2017-03-133-0/+19
* Update occurrences of MWBS to MWPSfix/mwbs-to-mwpsJames Lopez2017-03-018-5/+6
* Fix most of broken docs linksAchilleas Pipinellis2017-02-151-1/+1
* Rename builds to jobs in docsAchilleas Pipinellis2017-02-152-7/+7
* Move merge requests index file inside the merge_requests dirAchilleas Pipinellis2017-02-132-10/+176
* Add docs for resolve conflicts editorAchilleas Pipinellis2017-01-242-0/+12
* Add images to issue creation from unresolved discussionsAchilleas Pipinellis2016-12-223-2/+6
* Feature: delegate all open discussions to IssueBob Van Landuyt2016-12-052-1/+20
* Move MWPS document to new locationAchilleas Pipinellis2016-11-292-44/+49
* Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-2529-0/+0
|\
| * Reduce size of images from 25MB to 13MB using pngquantAchilleas Pipinellis2016-11-2229-0/+0
* | Update some docs to reflect MWPS name changeGrzegorz Bizon2016-11-211-8/+8
|/
* Add documentation for the "Only allow merge requests to be merged if all disc...Rémy Coutable2016-11-044-2/+20
* Refactor merge requests revisionsAchilleas Pipinellis2016-10-144-10/+20
* Update documentation according to changes in MWBSGrzegorz Bizon2016-10-071-10/+10
* 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