diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-18 19:34:32 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-18 19:34:32 +0300 |
| commit | 30d2d2381f608b7c926747d61a9231aa417ea5da (patch) | |
| tree | 16b5f2d3452210b2be232b0bae0ddfbb968ec460 /app/controllers/dashboard_controller.rb | |
| parent | cc5440e82a396fe4967a0b31322d9bb67ee70057 (diff) | |
| parent | 60bb35161741338e585feedf09538f5935bba271 (diff) | |
| download | gitlab-ce-30d2d2381f608b7c926747d61a9231aa417ea5da.tar.gz | |
Merge branch 'feature/users_groups' into 6-0-dev
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 |