summaryrefslogtreecommitdiff
path: root/spec/models/merge_request_spec.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'show-all-pipelines-from-all-diffs' into 'master' Rémy Coutable2016-09-211-6/+53
|\
| * Use factory instead of using new directly. Feedback:show-all-pipelines-from-all-diffsLin Jen-Shin2016-09-211-9/+2
| * Add a test for non-persisted merge requestLin Jen-Shin2016-09-201-0/+22
| * Test against MergeRequest#all_commits_sha, feedback:Lin Jen-Shin2016-09-201-9/+22
| * Show all pipelines from all merge_request_diffs:Lin Jen-Shin2016-09-191-6/+25
* | Improve specsKamil Trzcinski2016-09-211-0/+1
* | Add tests to verify the correctness of returned environmentsKamil Trzcinski2016-09-211-6/+46
|/
* MergeRequest#environments now returns an empty array when diff_head_commit is...22246-actionview-template-error-undefined-method-each-for-nil-nilclassRémy Coutable2016-09-161-6/+14
* Change method name to #reopenable?Katarzyna Kobierska2016-09-131-9/+9
* Improve grammarKatarzyna Kobierska2016-09-131-1/+1
* Fix not working test with executeKatarzyna Kobierska2016-09-131-4/+4
* Improve grammarKatarzyna Kobierska2016-09-131-1/+1
* Add #can_reopen? and testsKatarzyna Kobierska2016-09-131-19/+45
* Add methodKatarzyna Kobierska2016-09-131-0/+13
* Add test checking method closed_without_source_projectKatarzyna Kobierska2016-09-131-0/+38
* Merge branch 'artifacts-from-ref-and-build-name' into 'master' Douwe Maan2016-08-301-2/+2
|\
| * Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-261-13/+48
| |\
| * \ Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-191-0/+92
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-181-0/+79
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-161-0/+15
| |\ \ \ \
| * | | | | Fix mockLin Jen-Shin2016-08-111-2/+2
* | | | | | Change method nameKatarzyna Kobierska2016-08-301-4/+4
* | | | | | Improve grammarKatarzyna Kobierska2016-08-301-7/+7
* | | | | | Improve codeKatarzyna Kobierska2016-08-301-4/+16
* | | | | | User can edit closed MR with deleted forkKatarzyna Kobierska2016-08-301-0/+64
| |_|_|_|/ |/| | | |
* | | | | Merge branch '21275-getting-500-error-when-viewing-a-merge-request'Douwe Maan2016-08-251-0/+13
|\ \ \ \ \
| * | | | | Don't show conflicts when there are noneSean McGivern2016-08-251-0/+6
| * | | | | Handle case where conflicts aren't on disk yetSean McGivern2016-08-251-0/+7
| | |_|_|/ | |/| | |
* | | | | Restore diff_sha_refs methodDmitriy Zaporozhets2016-08-221-3/+3
* | | | | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-191-0/+186
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-171-0/+79
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'mc-ui'Douwe Maan2016-08-171-0/+52
| | |\ \ \
| | | * \ \ Merge branch 'master' into mc-uiDouwe Maan2016-08-151-0/+15
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Rename `can_resolve_conflicts_in_ui?` to `conflicts_can_be_resolved_in_ui?`Douwe Maan2016-08-121-8/+8
| | | * | | Add more tests for conflictsSean McGivern2016-08-121-0/+52
| | | | |/ | | | |/|
| | * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18681-pipelines...Kamil Trzcinski2016-08-161-7/+89
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Use merge_request_diff instead of doubles for testing pipelines for Merge Req...Kamil Trzcinski2016-08-151-13/+8
| | * | | Properly select a list of Pipelines for a Merge RequestsKamil Trzcinski2016-08-121-0/+32
| * | | | Store discussion_id on Note for faster discussion lookup.Douwe Maan2016-08-171-1/+1
| * | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-161-0/+15
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Method names changed to #includes_commit?zj-deployment-status-on-mrZ.J. van de Weg2016-08-121-7/+4
| | * | | CI build status not per environmentZ.J. van de Weg2016-08-111-1/+4
| | * | | Incorporate feedbackZ.J. van de Weg2016-08-111-0/+15
| | | |/ | | |/|
| * | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-121-3/+3
| |\ \ \ | | |/ /
| * | | Add specs for Discussion and MergeRequest modelsDouwe Maan2016-08-121-0/+92
* | | | Fix merge request diffs specDmitriy Zaporozhets2016-08-151-1/+1
* | | | Fix and refactor merge request diff_refs methodDmitriy Zaporozhets2016-08-151-6/+7
* | | | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-151-4/+58
|\ \ \ \ | | |/ / | |/| |
| * | | adds second batch of tests changed to active tenseactive-tense-test-coveragetiagonbotelho2016-08-091-3/+3
| |/ /
| * | change the API on the merge_request_diff model from diffs -> raw_diffsuse-raw-diffs-for-merge-request-diffsPaco Guzman2016-08-031-2/+2
View Lorry Controller Status