diff options
| author | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-14 17:02:16 +0100 |
|---|---|---|
| committer | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-14 17:02:16 +0100 |
| commit | c8b92a4be2d526a128e17c784bd9af93e5ee91f5 (patch) | |
| tree | 9721643ba758ef55cc0bd12a539b66d60795421c /app/models/project.rb | |
| parent | c305eb31aa1cf1aec24b907e0db1d7b2084400dc (diff) | |
| parent | ed3f44085e01f50864ce840f007a50d2154df6f5 (diff) | |
| download | gitlab-ce-c8b92a4be2d526a128e17c784bd9af93e5ee91f5.tar.gz | |
Merge branch 'master' into fixes/api
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index ce429bc3d75..9c62e08fb82 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -103,7 +103,7 @@ class Project < ActiveRecord::Base end def with_push - includes(:events).where('events.action = ?', Event::Pushed) + includes(:events).where('events.action = ?', Event::PUSHED) end def active @@ -336,7 +336,7 @@ class Project < ActiveRecord::Base def observe_push(data) Event.create( project: self, - action: Event::Pushed, + action: Event::PUSHED, data: data, author_id: data[:user_id] ) |