summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
Commit message (Expand)AuthorAgeFilesLines
* Correctly determine mergeability of MR with no discussions24863-mrs-without-discussions-are-mergeableDouwe Maan2016-11-231-1/+5
* Fix a wrong "The build for this merge request failed" message24616-mr-shows-the-build-for-this-merge-request-failed-although-builds-still-runningRémy Coutable2016-11-211-1/+1
* Make commit an optional arg for environments searchGrzegorz Bizon2016-11-091-6/+9
* Add setting to only allow merge requests to be merged when all discussions ar...Rodolfo Santos2016-11-041-0/+7
* Ensure merge request's "remove branch" accessors return booleans24102-cannot-unselect-remove-source-branch-when-editing-merge-requestRémy Coutable2016-11-031-2/+2
* add "x of y tasks completed" on issuableGuilherme Salazar2016-10-281-1/+0
* Remove redundant class_name and foreign_key overridesDavid Wagner2016-10-241-2/+2
* Rename forked_source_project_missing? to source_project_missing?Nick Thomas2016-10-201-3/+3
* Fix the merge request view when source projects or branches are removedNick Thomas2016-10-201-9/+6
* Revert "Add #closed_without_source_project?"Nick Thomas2016-10-201-8/+2
* Add self.project_foreign_key on both Issue and MergeRequestDouglas Barbosa Alexandre2016-10-191-0/+4
* Improve code that creates a list of commits for MR21444-pipeliens-new-mrGrzegorz Bizon2016-10-181-2/+3
* Extend merge request tests for all commits methodGrzegorz Bizon2016-10-181-3/+4
* Use temporary compare commits when MR not persistedGrzegorz Bizon2016-10-181-11/+9
* Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-171-6/+9
|\
| * Refactor ci_status on MergeRequestControllerZ.J. van de Weg2016-10-141-14/+8
| * Fix indenting error in HAMLZ.J. van de Weg2016-10-141-1/+1
| * Show what time ago a MR was deployedZ.J. van de Weg2016-10-141-0/+9
* | Allow setting content for resolutionsSean McGivern2016-10-131-1/+1
|/
* MergeRequest new form load diff asynchronouslynew-merge-requests-commit-tab-activePaco Guzman2016-10-061-2/+2
* Fix bug when trying to cache closed issues from external issue trackersissue_22446Felipe Artur2016-10-031-0/+4
* Add a /wip slash commandThomas Balthazar2016-10-031-4/+20
* Improve how MergeCommit#merge_commit_message builds the messageRobert Speicher2016-09-271-7/+5
* Merge branch 'show-all-pipelines-from-all-diffs' into 'master' Rémy Coutable2016-09-211-4/+17
|\
| * If merge request wasn't persisted yet, we show only 1 pipeline:Lin Jen-Shin2016-09-201-7/+11
| * slightly tweak about the comment, feedback:Lin Jen-Shin2016-09-201-1/+1
| * Introduce MergeRequest#all_commits_sha, feedback:Lin Jen-Shin2016-09-201-8/+9
| * Show all pipelines from all merge_request_diffs:Lin Jen-Shin2016-09-191-3/+11
* | Add tests to verify the correctness of returned environmentsKamil Trzcinski2016-09-211-3/+3
* | Limit number of shown environments for Merge RequestsKamil Trzcinski2016-09-211-3/+6
* | Use the `IssuableBaseService` lifecycle hooks to cache `MergeRequestsClosingI...Timothy Andrew2016-09-211-1/+1
* | Implement a second round of review comments from @DouweM.Timothy Andrew2016-09-211-6/+2
* | Implement (some) comments from @DouweM's review.Timothy Andrew2016-09-201-9/+1
* | Fix spec failures.Timothy Andrew2016-09-201-1/+5
* | Implement review comments from @yorickpeterseTimothy Andrew2016-09-201-3/+3
* | Merge remote-tracking branch 'origin/master' into 21170-cycle-analyticsTimothy Andrew2016-09-201-1/+11
|\ \ | |/
| * 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-1/+1
| * Change method name to #reopenable?Katarzyna Kobierska2016-09-131-2/+3
| * Add #can_reopen? and testsKatarzyna Kobierska2016-09-131-3/+1
| * Add methodKatarzyna Kobierska2016-09-131-0/+7
| * Add #closed_without_source_project?Katarzyna Kobierska2016-09-131-1/+5
| * Checks if deleting forked project closed all open merge requestsKatarzyna Kobierska2016-09-131-1/+1
* | Test all cycle analytics pre-calculation code.Timothy Andrew2016-09-191-0/+1
* | Improve performance of the cycle analytics page.Timothy Andrew2016-09-151-0/+15
* | Merge remote-tracking branch 'origin/master' into 21170-cycle-analyticsTimothy Andrew2016-09-071-19/+24
|\ \ | |/
| * Merge branch 'refactor/add-policies' into 'master' Robert Speicher2016-08-311-1/+1
| |\
| | * remove Ability.abilitieshttp://jneen.net/2016-08-301-1/+1
| * | Merge branch 'remove-fishy-smell' into 'master' Douwe Maan2016-08-311-2/+2
| |\ \ | | |/ | |/|
| | * Allow setting branch refs for MRremove-fishy-smellSean McGivern2016-08-251-2/+2
| * | Merge branch 'artifacts-from-ref-and-build-name' into 'master' Douwe Maan2016-08-301-1/+3
| |\ \
View Lorry Controller Status