diff options
| author | Drew Blessing <drew.blessing@me.com> | 2014-04-14 20:12:07 -0500 |
|---|---|---|
| committer | Drew Blessing <drew.blessing@me.com> | 2014-05-13 06:41:36 -0500 |
| commit | 5f25cdfe19c7c0a8c1ada592307e9017e2a754e1 (patch) | |
| tree | 82e2dde5c25c8dc9b6fa56dc1f2440910b2c1412 /app/models/merge_request.rb | |
| parent | 172ad9624599647df5682f7f2a9d2d74d947d068 (diff) | |
| download | gitlab-ce-5f25cdfe19c7c0a8c1ada592307e9017e2a754e1.tar.gz | |
Implement Merge Request Labels
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 8c885b70a48..a55f3a61398 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -36,7 +36,9 @@ class MergeRequest < ActiveRecord::Base delegate :commits, :diffs, :last_commit, :last_commit_short_sha, to: :merge_request_diff, prefix: nil - attr_accessible :title, :assignee_id, :source_project_id, :source_branch, :target_project_id, :target_branch, :milestone_id, :state_event, :description + attr_accessible :title, :assignee_id, :source_project_id, :source_branch, + :target_project_id, :target_branch, :milestone_id, + :state_event, :description, :label_list attr_accessor :should_remove_source_branch @@ -44,6 +46,9 @@ class MergeRequest < ActiveRecord::Base # It allows us to close or modify broken merge requests attr_accessor :allow_broken + ActsAsTaggableOn.strict_case_match = true + acts_as_taggable_on :labels + state_machine :state, initial: :opened do event :close do transition [:reopened, :opened] => :closed |