diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-12-14 19:33:33 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-12-14 19:33:33 +0200 |
| commit | 678e5355a3e43aa2a13d109fe5d75de231eef413 (patch) | |
| tree | 8ef7a4574d6cd85d1c9e2090da529da44941cf3a /app/models | |
| parent | 190e483fb4b5edb6d8dfa71b67dc52da402ddab9 (diff) | |
| download | gitlab-ce-678e5355a3e43aa2a13d109fe5d75de231eef413.tar.gz | |
Create events on comments and milestone
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/event.rb | 10 | ||||
| -rw-r--r-- | app/models/milestone.rb | 1 | ||||
| -rw-r--r-- | app/models/note.rb | 8 |
3 files changed, 18 insertions, 1 deletions
diff --git a/app/models/event.rb b/app/models/event.rb index 2b92783ceac..ee1998e5d4f 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -63,7 +63,7 @@ class Event < ActiveRecord::Base # - new issue # - merge request def allowed? - push? || issue? || merge_request? || membership_changed? + push? || issue? || merge_request? || membership_changed? || note? || milestone? end def project_name @@ -94,6 +94,14 @@ class Event < ActiveRecord::Base action == self.class::Reopened end + def milestone? + target_type == "Milestone" + end + + def note? + target_type == "Note" + end + def issue? target_type == "Issue" end diff --git a/app/models/milestone.rb b/app/models/milestone.rb index e700cc2f2f7..9e3c2bb5df6 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -14,6 +14,7 @@ class Milestone < ActiveRecord::Base attr_accessible :title, :description, :due_date, :closed + attr_accessor :author_id belongs_to :project has_many :issues diff --git a/app/models/note.rb b/app/models/note.rb index da15a173566..219ed9b9332 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -121,4 +121,12 @@ class Note < ActiveRecord::Base def downvote? note.start_with?('-1') || note.start_with?(':-1:') end + + def noteable_type_name + if noteable_type.present? + noteable_type.downcase + else + "wall" + end + end end |
