summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-20 17:22:39 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-20 17:22:39 +0300
commit5ed7c20150928194306ad51263b6a9b7fb4b4cfd (patch)
tree6d0c4c3b620b4fcf0ca953daaaecf782cb269d9d
parent72abe9f679043a1ac566f60109b21cadace204d7 (diff)
downloadgitlab-ce-5ed7c20150928194306ad51263b6a9b7fb4b4cfd.tar.gz
Prevent 500 error when filter projects with push in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/models/project.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 90d2649ba23..613f98ba44b 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -173,7 +173,7 @@ class Project < ActiveRecord::Base
end
def with_push
- includes(:events).where('events.action = ?', Event::PUSHED)
+ joins(:events).where('events.action = ?', Event::PUSHED)
end
def active