summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
Commit message (Expand)AuthorAgeFilesLines
* Correctly find last known blob for file deleted in MR.merge-request-deleted-fileDouwe Maan2015-10-201-1/+13
* Only accept open issues and merge requestsZeger-Jan van de Weg2015-10-161-4/+0
* Show merge requests which close current issueZeger-Jan van de Weg2015-10-161-0/+4
* merge_request: add work_in_progress to MR hooksBen Boeckel2015-10-081-1/+2
* merge_request: coerce work_in_progress? into a booleanBen Boeckel2015-10-081-1/+1
* Fetch merge request ref if it is missing when visit MR pagefix-mr-without-refsDmitriy Zaporozhets2015-09-211-1/+13
* Re-annotate modelsStan Hu2015-09-061-0/+1
* Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-20/+35
* Revert "Merge branches inside one repository using rugged instead of satellites"Dmitriy Zaporozhets2015-08-111-14/+1
* Revert "Merge branch 'refactor-can-be-merge' into 'master'"Dmitriy Zaporozhets2015-08-111-1/+7
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-111-32/+24
* Revert "Merge branch 'improve-merge-requests' into 'master' "Dmitriy Zaporozhets2015-08-111-1/+1
* Fetch to mr code from fork to iidDmitriy Zaporozhets2015-08-071-1/+1
* Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-161-13/+12
* Refactor compare and fetch logicDmitriy Zaporozhets2015-07-151-0/+8
* Implement merge from forks without satellitesDmitriy Zaporozhets2015-07-151-7/+12
* Remove satellitesDmitriy Zaporozhets2015-07-151-3/+3
* Refactor can_be_merged logic for merge requestDmitriy Zaporozhets2015-07-011-7/+1
* Merge branches inside one repository using rugged instead of satellitesDmitriy Zaporozhets2015-07-011-1/+14
* Revert merge request states renamingDmitriy Zaporozhets2015-06-191-5/+13
* Improve variables in mr widgetDmitriy Zaporozhets2015-06-111-0/+4
* Refactor accept merge request widgetDmitriy Zaporozhets2015-06-111-0/+8
* Support editing target branch of merge requestStan Hu2015-05-291-1/+0
* Merge branch 'accepted-rejected-mrs' into 'master'Dmitriy Zaporozhets2015-05-271-1/+1
|\
| * Consistently refer to MRs as either Accepted or Rejected.Douwe Maan2015-05-251-1/+1
* | Surround Project.reference_pattern in parenthesis inside other patternsRobert Speicher2015-05-261-1/+1
* | Add `reference_pattern` to Referable modelsRobert Speicher2015-05-261-0/+10
* | Implement gfm_reference directly in MentionableRobert Speicher2015-05-261-5/+0
* | Add `to_reference` for models that support referencesRobert Speicher2015-05-261-3/+18
|/
* Don't allow a merge request to be merged when its title starts with "WIP".Douwe Maan2015-04-301-0/+18
* Select MR commit notes from source project.Douwe Maan2015-04-241-3/+6
* No longer needed to pass project argument to commit methods.Douwe Maan2015-04-241-2/+2
* fix stuck mrBen Bodenmiller2015-04-141-1/+3
* Refactor ClosingIssueExtractor.Douwe Maan2015-04-031-2/+2
* Only allow users to cross-reference and close issues they have access to.Douwe Maan2015-04-021-3/+3
* Don't mark merge request as updated when merge status relative to target bran...merge-status-without-timestampsDouwe Maan2015-03-231-0/+9
* Update merge_status state to allow more transitionsDJ Mountney2015-03-191-2/+2
* Remove old team scopes.Douwe Maan2015-03-151-1/+0
* Fix method overlap for issue sortingDmitriy Zaporozhets2015-02-051-0/+1
* Convert hashes to ruby 1.9 styleDmitriy Zaporozhets2015-02-021-1/+1
* Annotate modelsDmitriy Zaporozhets2015-01-221-0/+1
* Merge pull request #7999 from cirosantilli/append-inplaceDmitriy Zaporozhets2015-01-211-1/+2
|\
| * Append in place for strings and arraysCiro Santilli2015-01-011-1/+2
* | Fix various typosSteven Burgart2015-01-181-2/+2
* | Refactor merge request merge serviceDmitriy Zaporozhets2015-01-061-1/+3
|/
* Automatically close merge requests that were locker for 1 dayDmitriy Zaporozhets2014-12-051-0/+4
* Set/unset merge request locked_at timestamp after transitionDmitriy Zaporozhets2014-12-051-0/+10
* Add task lists to issues and merge requestsVinnie Okada2014-10-051-0/+1
* Hook attributesKirill Zaitsev2014-10-021-0/+14
* Improve error reporting on users APIjubianchi2014-09-161-3/+6
View Lorry Controller Status