diff options
| author | Sergio Visinoni <sergio.visinoni@blocket.se> | 2012-10-26 14:52:10 +0200 |
|---|---|---|
| committer | Sergio Visinoni <sergio.visinoni@blocket.se> | 2012-10-26 16:12:40 +0200 |
| commit | a7d0816933497a9e2db6abac7fac3ad73ac58582 (patch) | |
| tree | f06f545d0dc07449bacc83d9d81e654641ff3bb2 /app/models/merge_request.rb | |
| parent | 4f687aaa8e7f62da40cb03f007cc6ad30047c18f (diff) | |
| download | gitlab-ce-a7d0816933497a9e2db6abac7fac3ad73ac58582.tar.gz | |
Add Milestone information in Merge Requests
Step 1:
* Add milestone_id in the model for merge_requests
* Make it possible to create or update a Merge Request with an attached
Milestone detail
* Add the possibility to filter by Milestone and / or Assignee in the
Merge Requests listing page
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 70780b75d45..8a521583a3c 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -4,11 +4,13 @@ class MergeRequest < ActiveRecord::Base include IssueCommonality include Votes - attr_accessible :title, :assignee_id, :closed, :target_branch, :source_branch, + attr_accessible :title, :assignee_id, :closed, :target_branch, :source_branch, :milestone_id, :author_id_of_changes attr_accessor :should_remove_source_branch + belongs_to :milestone + BROKEN_DIFF = "--broken-diff" UNCHECKED = 1 @@ -26,6 +28,10 @@ class MergeRequest < ActiveRecord::Base where("source_branch LIKE :branch OR target_branch LIKE :branch", branch: branch_name) end + def self.find_all_by_milestone(milestone) + where("milestone_id = :milestone_id", milestone_id: milestone) + end + def human_state states = { CAN_BE_MERGED => "can_be_merged", @@ -212,5 +218,6 @@ end # st_diffs :text(4294967295 # merged :boolean default(FALSE), not null # state :integer default(1), not null +# milestone_id :integer # |