diff options
| author | Josh Frye <joshfng@gmail.com> | 2016-02-06 12:36:46 -0500 |
|---|---|---|
| committer | Josh Frye <joshfng@gmail.com> | 2016-02-09 10:10:41 -0500 |
| commit | 8b4e9720d948d0f0fe61ba7344158560e639393f (patch) | |
| tree | 933c37ed98f5f505054c1f5a27c484ac4e386e95 /app/controllers/dashboard | |
| parent | 30e022a2feec7450c4173038d3fdfef0d6242953 (diff) | |
| download | gitlab-ce-8b4e9720d948d0f0fe61ba7344158560e639393f.tar.gz | |
Extract events rendering to own action.
Diffstat (limited to 'app/controllers/dashboard')
| -rw-r--r-- | app/controllers/dashboard/projects_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb index 0bcc78a8bc7..2413680a4b0 100644 --- a/app/controllers/dashboard/projects_controller.rb +++ b/app/controllers/dashboard/projects_controller.rb @@ -12,7 +12,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController @projects = @projects.search(terms) end - @projects = @projects.page(params[:page]).per(PER_PAGE) + @projects = @projects.page(params[:page]).per(PER_PAGE) if !terms.present? @last_push = current_user.recent_push respond_to do |format| @@ -41,7 +41,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController @projects = @projects.search(terms) end - @projects = @projects.page(params[:page]).per(PER_PAGE) + @projects = @projects.page(params[:page]).per(PER_PAGE) if !terms.present? @last_push = current_user.recent_push @groups = [] |