summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
Commit message (Expand)AuthorAgeFilesLines
* 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
* Annotate modelsDmitriy Zaporozhets2014-08-251-0/+1
* Migrate issue/mr labels from act_as_taggable to own labelsDmitriy Zaporozhets2014-07-291-3/+0
* Improve MR buildingDmitriy Zaporozhets2014-07-281-1/+1
* Moved some behaviour to one placeJeroen van Baarsen2014-07-251-3/+1
* Refactor diff suppress logic and diff viewsDmitriy Zaporozhets2014-07-151-1/+2
* Refactor MR build processDmitriy Zaporozhets2014-07-151-0/+4
* Add a mention of the merge request into its default commit message.Christian Taedcke2014-07-011-0/+2
* Merge branch 'strong-parameters' into 'master'Dmitriy Zaporozhets2014-06-301-4/+0
|\
| * Remove protected_atrributes gem and start moving to strong paramsDmitriy Zaporozhets2014-06-261-4/+0
* | Rename MergeRequest#lock! to #lock_mr!Jacob Vosmaer2014-06-261-2/+2
|/
* Detect closing issues in Merge Request descriptionJacob Vosmaer2014-06-131-1/+3
* Add merged mrs list to milestone pageDmitriy Zaporozhets2014-06-051-0/+1
* Dont show remove source branch ckecbox/button if you dont have suchDmitriy Zaporozhets2014-05-271-4/+0
* Merge pull request #6778 from dblessing/feature/mr_labelsDmitriy Zaporozhets2014-05-131-1/+6
|\
| * Implement Merge Request LabelsDrew Blessing2014-05-131-1/+6
* | Add MergeRequest#target_project_namespaceDmitriy Zaporozhets2014-05-081-0/+8
|/
* Re-annotate modelsDmitriy Zaporozhets2014-04-091-4/+2
* Allow people to remove source branch of fork project in MRDmitriy Zaporozhets2014-04-071-1/+1
* Fix MR fork validation and services loadDmitriy Zaporozhets2014-04-031-1/+3
* Use MergeRequest services in API and controllersDmitriy Zaporozhets2014-04-021-0/+15
* Remove author_id_of_changes from appDmitriy Zaporozhets2014-03-251-1/+1
* Fix error with reopened merge request not properly reloadingDaniel Cestari2014-03-121-1/+1
View Lorry Controller Status