diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-12-12 14:17:14 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-12-12 14:17:14 +0000 |
| commit | d673628de003d1ce1402f03311066339828fb811 (patch) | |
| tree | 11be734cba3522f4c964c2941427b99f7ae4a442 /app/controllers | |
| parent | 51172fdf81a8ef4eda20de5a92d3c997a7b124c9 (diff) | |
| parent | 5a1ebf1d93f3a8d1d486b091f5436440bed5a52b (diff) | |
| download | gitlab-ce-d673628de003d1ce1402f03311066339828fb811.tar.gz | |
Merge branch 'single-list-multiple-clusters' into 'master'
Use Single list for multiple clusters
See merge request gitlab-org/gitlab-ce!15848
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/clusters_controller.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb index 0907daacbc3..4a7879db313 100644 --- a/app/controllers/projects/clusters_controller.rb +++ b/app/controllers/projects/clusters_controller.rb @@ -8,11 +8,8 @@ class Projects::ClustersController < Projects::ApplicationController STATUS_POLLING_INTERVAL = 10_000 def index - @scope = params[:scope] || 'all' - @clusters = ClustersFinder.new(project, current_user, @scope).execute.page(params[:page]) - @active_count = ClustersFinder.new(project, current_user, :active).execute.count - @inactive_count = ClustersFinder.new(project, current_user, :inactive).execute.count - @all_count = @active_count + @inactive_count + clusters = ClustersFinder.new(project, current_user, :all).execute + @clusters = clusters.page(params[:page]).per(20) end def new |