Merge branch 'fix-500-admin-projects' into 'master'

Fix 500 error when filtering projects in admin interface Fixes #1693 See merge request !1200
gitlabhq · Oct 20, 2014 · 3f4cfd3 · 3f4cfd3
2 parents 72abe9f + 5ed7c20
commit 3f4cfd3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/models/project.rb b/app/models/project.rb
@@ -173,7 +173,7 @@ def publicish(user)
     end
 
     def with_push
-      includes(:events).where('events.action = ?', Event::PUSHED)
+      joins(:events).where('events.action = ?', Event::PUSHED)
     end
 
     def active