diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-09 16:41:21 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-09 16:41:21 +0300 |
| commit | d516b02eb4e40aa0c5c3f4a1d5d957f5657c2426 (patch) | |
| tree | aee039a1c64dadd854054034f4c3de12539981fb | |
| parent | 870f553bf3ec63d9f137afd0b67e8a338a745027 (diff) | |
Fix brakeman
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 | ||||
| -rw-r--r-- | app/controllers/ci/admin/builds_controller.rb | 12 |
3 files changed, 14 insertions, 8 deletions
@@ -216,7 +216,7 @@ gem 'virtus', '~> 1.0.1' group :development do gem "foreman" - gem 'brakeman', require: false + gem 'brakeman', '3.0.1', require: false gem "annotate", "~> 2.6.0" gem "letter_opener", '~> 1.1.2' diff --git a/Gemfile.lock b/Gemfile.lock index 86f6dd29699..f252d33c9ad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,14 +72,14 @@ GEM bootstrap-sass (3.3.5) autoprefixer-rails (>= 5.0.0.1) sass (>= 3.2.19) - brakeman (3.0.5) + brakeman (3.0.1) erubis (~> 2.6) fastercsv (~> 1.5) haml (>= 3.0, < 5.0) highline (~> 1.6.20) multi_json (~> 1.2) ruby2ruby (~> 2.1.1) - ruby_parser (~> 3.7.0) + ruby_parser (~> 3.5.0) sass (~> 3.0) terminal-table (~> 1.4) browser (1.0.0) @@ -606,7 +606,7 @@ GEM ruby2ruby (2.1.4) ruby_parser (~> 3.1) sexp_processor (~> 4.0) - ruby_parser (3.7.1) + ruby_parser (3.5.0) sexp_processor (~> 4.1) rubyntlm (0.5.2) rubypants (0.2.0) @@ -791,7 +791,7 @@ DEPENDENCIES better_errors (~> 1.0.1) binding_of_caller (~> 0.7.2) bootstrap-sass (~> 3.0) - brakeman + brakeman (= 3.0.1) browser (~> 1.0.0) byebug cal-heatmap-rails (~> 0.0.1) diff --git a/app/controllers/ci/admin/builds_controller.rb b/app/controllers/ci/admin/builds_controller.rb index 8fc776dd98e..38abfdeafbf 100644 --- a/app/controllers/ci/admin/builds_controller.rb +++ b/app/controllers/ci/admin/builds_controller.rb @@ -4,9 +4,15 @@ module Ci @scope = params[:scope] @builds = Ci::Build.order('created_at DESC').page(params[:page]).per(30) - if ["pending", "running"].include? @scope - @builds = @builds.send(@scope) - end + @builds = + case @scope + when "pending" + @builds.pending + when "running" + @builds.running + else + @builds + end end end end |