summaryrefslogtreecommitdiff
path: root/spec/features/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Add workaround for JS error in specSean McGivern2016-08-171-1/+5
* Merge branch 'master' into mc-uiDouwe Maan2016-08-151-0/+2
|\
| * Updated testsPhil Hughes2016-08-131-0/+2
* | Fix failed test because of a copy change.Fatih Acet2016-08-121-1/+1
* | Add more tests for conflictsSean McGivern2016-08-121-0/+68
|/
* Pre-create all builds for Pipeline when a trigger is receivedKamil Trzcinski2016-08-111-4/+8
* fixes part1 of files to start using active tensetiagonbotelho2016-08-094-9/+9
* State specific default sort order for issuableszs2016-08-011-21/+12
* Remove flaky diff note tests for nowremove-flaky-diff-note-testsDouwe Maan2016-07-201-94/+0
* Added diff comments feature testfix-side-by-side-comment-widgetLuke "Jared" Bennett2016-07-191-0/+94
* Revert "Optimistic locking for Issue and Merge Requests"revert-lock-for-issuableStan Hu2016-07-131-11/+0
* Optimistic locking for Issue and Merge RequestsValery Sizov2016-07-121-0/+11
* Be explicit on merge request discussion variablesPaco Guzman2016-07-121-0/+25
* Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-063-4/+4
* Rename ci_commit -> pipelineRémy Coutable2016-06-101-7/+7
* Improve initial implementation of the 'only_allow_merge_if_build_succeeds.rb'...Rémy Coutable2016-06-101-46/+46
* Allow or not merge MR with failed buildRui Anderson2016-06-101-0/+105
* Fix tests failuresKamil Trzcinski2016-06-071-2/+2
* Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-061-0/+49
|\
| * Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-061-0/+49
| |\
| | * Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-032-0/+67
| | |\
| | * | Incorportate feedbackZ.J. van de Weg2016-06-011-30/+7
| | * | Remove tests specific for awards on notesZJ van de Weg2016-05-261-67/+0
| | * | Adds the emoji menu to the body and then re-positions it depending on which b...Phil Hughes2016-05-191-7/+6
| | * | Award spec for merge requestsPhil Hughes2016-05-191-0/+140
* | | | Rename remaining ci_commits in specsKamil Trzcinski2016-06-031-1/+1
* | | | Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski2016-06-032-4/+4
|/ / /
* | | Rename Ci::Build commit to pipelineKamil Trzcinski2016-06-031-2/+2
| |/ |/|
* | Merge branch 'fix/error-500-in-pipeline-when-fork' into 'master' Rémy Coutable2016-06-011-0/+58
|\ \
| * | Add feature specs for pipeline in MR from forkGrzegorz Bizon2016-06-011-8/+38
| * | Add feature test for accessing MR created from forkGrzegorz Bizon2016-06-011-0/+28
| |/
* | Fix error 500 when sorting issues by milestone due date and filtering by labelsFelipe Artur2016-05-311-0/+9
|/
* Add tests for unintentional filtering bug in MR (cf. !3872)Takuya Noguchi2016-05-151-0/+15
* Fix an issue when filtering merge requests with more than one labelRémy Coutable2016-05-101-0/+137
* Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-05-021-0/+10
|\
| * Prevent private project name and namespace from leaking in the new MR viewRémy Coutable2016-04-251-0/+10
* | Syntax and code improvementsAlfredo Sumaran2016-04-261-3/+4
* | Use variables instead of letAlfredo Sumaran2016-04-261-3/+2
* | Update wordingAlfredo Sumaran2016-04-261-2/+2
* | Use click_linkAlfredo Sumaran2016-04-261-1/+1
* | Add documentation for "Hide whitespace changes" buttonAlfredo Sumaran2016-04-261-1/+1
* | Specs for toggle Whitespaces ChangesAlfredo Sumaran2016-04-261-0/+22
|/
* Merge branch 'multi-filter-labels' into 'master' Jacob Schatz2016-04-201-0/+6
|\
| * fix failing testsArinde Eniola2016-04-151-0/+6
* | Add testsfix-mr-cherry-pick-without-merge-commitDouwe Maan2016-04-201-0/+44
|/
* Merge branch 'fix_quick_submit_missing_in_edit_merge_request' into 'master' Jacob Schatz2016-04-121-0/+21
|\
| * add some changes to the testfix_quick_submit_missing_in_edit_merge_requestArinde Eniola2016-04-071-11/+5
| * add testArinde Eniola2016-04-071-0/+27
* | Build fixPhil Hughes2016-04-061-3/+8
|/
* Fix creation of merge requests for orphaned branchesStan Hu2016-04-041-0/+28