diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-04 18:42:37 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-01-04 18:42:37 +0000 |
| commit | 6f4ea679d9ac18509df9216cef14f5d74ad19212 (patch) | |
| tree | fca00b6133f16910184d4931dcc838ab1a6b64a8 /app/controllers | |
| parent | ce4c38b35cca14eb50640e138c5faa354f8d6e72 (diff) | |
| parent | 10a9751ace57a368ebf39a1f8a3b172783cbeab1 (diff) | |
| download | gitlab-ce-6f4ea679d9ac18509df9216cef14f5d74ad19212.tar.gz | |
Merge branch 'show-all-builds-by-default' into 'master'
Show all builds by default in the builds page
Fixes #4240
See merge request !2243
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/builds_controller.rb | 6 | ||||
| -rw-r--r-- | app/controllers/projects/builds_controller.rb | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/controllers/admin/builds_controller.rb b/app/controllers/admin/builds_controller.rb index 83d9684c706..0db91eaaf2e 100644 --- a/app/controllers/admin/builds_controller.rb +++ b/app/controllers/admin/builds_controller.rb @@ -5,12 +5,12 @@ class Admin::BuildsController < Admin::ApplicationController @builds = @all_builds.order('created_at DESC') @builds = case @scope - when 'all' - @builds + when 'running' + @builds.running_or_pending.reverse_order when 'finished' @builds.finished else - @builds.running_or_pending.reverse_order + @builds end @builds = @builds.page(params[:page]).per(30) end diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb index 26ba12520c7..39d3ba26ba2 100644 --- a/app/controllers/projects/builds_controller.rb +++ b/app/controllers/projects/builds_controller.rb @@ -12,12 +12,12 @@ class Projects::BuildsController < Projects::ApplicationController @builds = @all_builds.order('created_at DESC') @builds = case @scope - when 'all' - @builds + when 'running' + @builds.running_or_pending.reverse_order when 'finished' @builds.finished else - @builds.running_or_pending.reverse_order + @builds end @builds = @builds.page(params[:page]).per(30) end |