deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into fixes/api

Browse source
This commit is contained in:
Sebastian Ziebell 2013-02-14 17:02:16 +01:00
commit c8b92a4be2
22 changed files with 201 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/project.rb
View file

@ -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]
)