summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
Commit message (Expand)AuthorAgeFilesLines
* Prevent duplicate merge eventsDmitriy Zaporozhets2013-02-271-8/+1
* Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq int...Dmitriy Zaporozhets2013-02-261-57/+30
|\
| * human_merge_status replaced by human_merge_status_nameAndrew8xx82013-02-201-5/+0
| * class.self methods moved to scopesAndrew8xx82013-02-201-18/+3
| * State machine added for merge_status fieldAndrew8xx82013-02-201-35/+28
* | Fix merge request closed filter. Fixed one more testDmitriy Zaporozhets2013-02-211-0/+4
|/
* Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-...Dmitriy Zaporozhets2013-02-191-32/+45
|\
| * Hash syntax improvedAndrew8xx82013-02-181-2/+2
| * Merge Request uses StateMachine nowAndrew8xx82013-02-181-1/+1
| * Merge Request uses StateMachine nowAndrew8xx82013-02-181-22/+32
| * State renamed to merge_statusAndrew8xx82013-02-181-9/+9
* | Fix project filter for MR on dashboardDmitriy Zaporozhets2013-02-191-5/+12
|/
* Constants in Events looks good nowAndrew8xx82013-02-131-3/+3
* more refactoring using models/concernsDmitriy Zaporozhets2013-01-031-2/+1
* Few more fixes after removing rolesDmitriy Zaporozhets2013-01-031-1/+1
* Split commit_id and noteable_id for NoteDmitriy Zaporozhets2012-12-181-1/+1
* Improve CI integration for merge requestsDmitriy Zaporozhets2012-12-111-0/+4
* Remove MergeRequest#to_raw and replace it with #to_diff and #to_patchRiyad Preukschas2012-11-251-12/+14
* Annotated. schema updatedDmitriy Zaporozhets2012-11-191-22/+21
* Refactor milestones related functionality. Added seeds for Milestine and MRrandx2012-10-301-2/+0
* Finalize milestones for Merge Requestsrandx2012-10-291-0/+1
* Merge branch 'public_submission_milestones_for_mr' of https://github.com/piff...randx2012-10-291-1/+8
|\
| * Add Milestone information in Merge RequestsSergio Visinoni2012-10-261-1/+8
* | Change argument order for satellite actions to always start with the userRiyad Preukschas2012-10-261-2/+2
* | Renamed Gitlab::Merge to Gitlab::Satellite::MergeActionRiyad Preukschas2012-10-261-2/+2
|/
* Fix bug in MergeRequest#mark_as_unmergableRiyad Preukschas2012-10-201-1/+2
* Refactor Gitlab::MergeRiyad Preukschas2012-10-201-1/+1
* minor code style fixingValeriy Sizov2012-10-121-1/+1
* Make MRs also count and display its commits' notesRiyad Preukschas2012-10-101-0/+5
* AnnotatedDmitriy Zaporozhets2012-10-091-2/+3
* simple refactoringAndrey Kumanyaev2012-10-091-3/+4
* cosmetical cleanup of modelsNihad Abbasov2012-09-271-3/+2
* annotate modelsNihad Abbasov2012-09-271-7/+7
* Use Rails.root.join where appropriateRobert Speicher2012-09-261-1/+1
* set activerecord whitelist_attributes to trueNihad Abbasov2012-09-261-1/+5
* Merge pull request #1409 from riyad/update-votesDmitriy Zaporozhets2012-09-111-1/+1
|\
| * Rename Upvote role to VotesRiyad Preukschas2012-09-081-1/+1
* | Prepared for gitolite v3randx2012-08-291-1/+1
|/
* Show only the commits that are newer in the merge request.Sytse Sijbrandij2012-08-211-2/+5
* Fully embrace Ruby 1.9 hash syntaxRobert Speicher2012-08-101-10/+10
* Consolidate functionality shared between Issue and MergeRequestRobert Speicher2012-08-081-45/+5
* Add empty IssueCommonality module; include in Issue and MergeRequestRobert Speicher2012-08-081-0/+1
* CHANGELOG updated. Fixed MR bug. Logger improvedDmitriy Zaporozhets2012-07-171-1/+1
* Feature: Unassigned Merge RequestsDmitriy Zaporozhets2012-07-171-1/+1
* MR: Handle broken diff ex. in case its too hugeDmitriy Zaporozhets2012-07-051-3/+16
* Tabs styled. MR Get Patchrandx2012-07-051-0/+12
* Reannotatedrandx2012-06-261-7/+11
* Issues & MR legendDmitriy Zaporozhets2012-06-211-0/+4
* Models Refactoring: Move methods to rolesDmitriy Zaporozhets2012-06-071-6/+2
* #888 prevent to remove source_branchZevs2012-06-051-1/+1
View Lorry Controller Status