diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-12-14 21:39:55 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-12-14 21:39:55 +0200 |
| commit | f2db188dbe26b93e76eb3536f1a972a4a9e01f66 (patch) | |
| tree | de924b6769965cbd7fb096ac74ed6f0f6d97daed /app/models/event.rb | |
| parent | 678e5355a3e43aa2a13d109fe5d75de231eef413 (diff) | |
| download | gitlab-ce-f2db188dbe26b93e76eb3536f1a972a4a9e01f66.tar.gz | |
Processing with note events. reformated dashboard for more events to handle
Diffstat (limited to 'app/models/event.rb')
| -rw-r--r-- | app/models/event.rb | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/app/models/event.rb b/app/models/event.rb index ee1998e5d4f..90376e73753 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -15,6 +15,7 @@ # class Event < ActiveRecord::Base + include NoteEvent include PushEvent attr_accessible :project, :action, :data, :author_id, :project_id, @@ -58,12 +59,14 @@ class Event < ActiveRecord::Base end end - # Next events currently enabled for system - # - push - # - new issue - # - merge request - def allowed? - push? || issue? || merge_request? || membership_changed? || note? || milestone? + def proper? + if push? + true + elsif membership_changed? + true + else + (issue? || merge_request? || note? || milestone?) && target + end end def project_name |