summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue_13621_2' into 'master' Douwe Maan2016-03-071-2/+0
|\
| * Updates from last code review.issue_13621_2Rubén Dávila2016-03-061-1/+0
| * Refactor GlobalMilestone queries.Rubén Dávila2016-03-041-1/+0
* | Merge branch 'indicate-mr-diverged-from-target' into 'master' Douwe Maan2016-03-071-0/+23
|\ \
| * | Indicate how much an MR branch diverges from the target branchPierre de La Morinerie2016-03-031-0/+23
* | | Change icons for open close on issue/MRJacob Schatz2016-03-041-0/+10
| |/ |/|
* | Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-031-3/+6
|/
* More updates from the last code review.Rubén Dávila2016-02-191-4/+2
* Don't show revert button if commit/MR has already been reverted.Rubén Dávila2016-02-191-0/+10
* Remove no longer required methods on MR.Rubén Dávila2016-02-191-12/+0
* Some updates from last code review.Rubén Dávila2016-02-191-2/+2
* Add some specs plus some refactor.Rubén Dávila2016-02-191-0/+8
* Use #iid for revert branch name so it's consistent when the MR id in the URL.Rubén Dávila2016-02-191-1/+1
* Some refactor to the revert commit creation.Rubén Dávila2016-02-191-1/+1
* Add merge_commit_sha column to merge_requests.Rubén Dávila2016-02-191-0/+1
* Create reverse branch and generate MR with new branch. #3409Rubén Dávila2016-02-191-0/+4
* Reopened MRs should also be considered as open.issue_13539Rubén Dávila2016-02-171-1/+1
* Don't try to mark broken MR as mergableNemanja Boric2016-02-111-1/+1
* Replaces "Create merge request" link with one to the MR when one existsDouglas Barbosa Alexandre2016-02-101-0/+1
* Merge branch 'disable-remove-source-branch' into 'master' Douwe Maan2016-02-041-1/+2
|\
| * Hide remove source branch button when new commit is added to branchZeger-Jan van de Weg2016-02-041-1/+2
* | Merge branch 'wipMergeSpacing' into 'master' Douwe Maan2016-02-041-1/+1
|\ \ | |/ |/|
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into wipMergeSpacingTed Hogan2015-12-291-27/+58
| |\
| * | No space required after WIP identifierTed Hogan2015-11-231-1/+1
* | | Merge branch 'merge-request-closes-issues-performance' into 'master'Robert Speicher2016-02-011-4/+4
|\ \ \
| * | | Optimize fetching issues closed by a merge requestmerge-request-closes-issues-performanceYorick Peterse2016-02-011-4/+4
* | | | Fix specsDouwe Maan2016-01-281-2/+2
* | | | Correctly determine MR diff base when MR has merge conflictsDouwe Maan2016-01-271-2/+2
|/ / /
* | | Save and use actual diff base commit for MR diff highlightingDouwe Maan2016-01-201-3/+12
* | | Fix MR diff_refsDouwe Maan2016-01-201-2/+2
* | | Check if MR is not broken.Rubén Dávila2016-01-191-1/+1
* | | Merge branch 'master' into issue_3945Rubén Dávila2016-01-141-28/+34
|\ \ \
| * \ \ Merge branch 'group-issues-sorting' into 'master' Dmitriy Zaporozhets2016-01-111-1/+1
| |\ \ \
| | * | | Removed ORDER BY in "of_group" scopesgroup-issues-sortingYorick Peterse2016-01-071-1/+1
| | * | | Don't pluck IDs when getting issues/MRs per groupYorick Peterse2016-01-071-1/+1
| * | | | Merge branch 'annotate-models-20160105' into 'master' Dmitriy Zaporozhets2016-01-071-22/+22
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Annotate modelsStan Hu2016-01-061-22/+22
| | | |/ | | |/|
| * | | Get "Merge when build succeeds" to work when commits were pushed to MR target...Douwe Maan2016-01-051-5/+11
| |/ /
* | | More refactoring from last code review. #3945Rubén Dávila2016-01-141-0/+4
|/ /
* | Backport JIRA serviceDrew Blessing2015-12-181-1/+1
* | Fixed Rubocop offensesGabriel Mazetto2015-12-151-3/+1
* | Merge remote-tracking branch 'origin/mr-broken'Dmitriy Zaporozhets2015-12-091-0/+4
|\ \
| * | Add indication to merge request list item that MR cannot be merged automaticallyDouwe Maan2015-12-081-0/+4
* | | Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-081-1/+1
|\ \ \ | |/ /
| * | Merge branch 'webhook_payload_with_changes' into 'master' Valery Sizov2015-12-071-1/+1
| |\ \
| | * | fox specsValery Sizov2015-12-071-1/+1
| | |/
* | | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-071-2/+9
|\ \ \ | |/ /
| * | Autolink first so we don't pick up numeric anchors as issue references.Douwe Maan2015-12-011-5/+2
| * | Recognize issue/MR/snippet/commit links as references.Douwe Maan2015-11-301-2/+9
| * | Show local issues and MRs in "This X closes... / closed by..." sentenceDouwe Maan2015-11-301-1/+1
| |/
View Lorry Controller Status