diff options
-rw-r--r-- | app/controllers/admin/projects_controller.rb | 2 | ||||
-rw-r--r-- | app/models/project.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb index 64aa6882b45..fc78db9e3a7 100644 --- a/app/controllers/admin/projects_controller.rb +++ b/app/controllers/admin/projects_controller.rb @@ -5,7 +5,7 @@ class Admin::ProjectsController < AdminController @projects = Project.scoped @projects = @projects.where(namespace_id: params[:namespace_id]) if params[:namespace_id].present? @projects = @projects.where(public: true) if params[:public_only].present? - @projects = @projects.joins(:events).where('events.action = ?', Event::Pushed) if params[:with_push].present? + @projects = @projects.with_push if params[:with_push].present? @projects = @projects.abandoned if params[:abandoned].present? @projects = @projects.where(namespace_id: nil) if params[:namespace_id] == Namespace.global_id @projects = @projects.search(params[:name]) if params[:name].present? diff --git a/app/models/project.rb b/app/models/project.rb index 4d4a64753f1..ac32352837a 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -92,6 +92,10 @@ class Project < ActiveRecord::Base where(id: project_ids) end + def with_push + includes(:events).where('events.action = ?', Event::Pushed) + end + def active joins(:issues, :notes, :merge_requests).order("issues.created_at, notes.created_at, merge_requests.created_at DESC") end |