diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-20 17:05:35 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-20 17:05:35 +0000 |
| commit | 3f4cfd362d1fde6c9c5e8bc7436b46e2c22c54ac (patch) | |
| tree | 6d0c4c3b620b4fcf0ca953daaaecf782cb269d9d | |
| parent | 72abe9f679043a1ac566f60109b21cadace204d7 (diff) | |
| parent | 5ed7c20150928194306ad51263b6a9b7fb4b4cfd (diff) | |
| download | gitlab-ce-3f4cfd362d1fde6c9c5e8bc7436b46e2c22c54ac.tar.gz | |
Merge branch 'fix-500-admin-projects' into 'master'
Fix 500 error when filtering projects in admin interface
Fixes #1693
See merge request !1200
| -rw-r--r-- | app/models/project.rb | 2 |
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 |