diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-17 21:00:59 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-18 17:47:52 +0300 |
| commit | ed9cff9a3c0a230f5497e85e8e178699ed02683e (patch) | |
| tree | dd1948a707534a9d3b0150125053f611c3f7c603 /app/controllers/dashboard_controller.rb | |
| parent | 7d57b96ee0f668acf10067b06a614b3052e27f89 (diff) | |
| download | gitlab-ce-ed9cff9a3c0a230f5497e85e8e178699ed02683e.tar.gz | |
Restyle project members page to fit both group and personal projects
Diffstat (limited to 'app/controllers/dashboard_controller.rb')
| -rw-r--r-- | app/controllers/dashboard_controller.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index b74c22b1547..9b3f59600c6 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -34,11 +34,12 @@ class DashboardController < ApplicationController @projects end - @projects = @projects.tagged_with(params[:label]) if params[:label].present? @projects = @projects.search(params[:search]) if params[:search].present? - @projects = @projects.page(params[:page]).per(30) @labels = Project.where(id: @projects.map(&:id)).tags_on(:labels) + + @projects = @projects.tagged_with(params[:label]) if params[:label].present? + @projects = @projects.page(params[:page]).per(30) end # Get authored or assigned open merge requests |