diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-13 14:43:46 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-13 14:43:46 +0300 |
| commit | 1f1c59b61d30b76d69f0f925b43a0b96465f38ed (patch) | |
| tree | 3e77115afc63a5d571798d4dda23f9f30e0a49b5 /app/models/merge_request.rb | |
| parent | 0c621708658da4b3cf88d805da5dbad920f3d27f (diff) | |
| parent | 5f25cdfe19c7c0a8c1ada592307e9017e2a754e1 (diff) | |
| download | gitlab-ce-1f1c59b61d30b76d69f0f925b43a0b96465f38ed.tar.gz | |
Merge pull request #6778 from dblessing/feature/mr_labels
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 134a8c8dd40..061537132b3 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 |