diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-10-14 14:21:49 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-10-14 17:38:26 +0200 |
| commit | d9ece71ef0677a1d3468697485db7cbcf1b83745 (patch) | |
| tree | 9af7f58de6b61833495a8578454edd2d224c366b /app | |
| parent | 4d69c6a3361bbc673e853995e3896d31241aa748 (diff) | |
| download | gitlab-ce-d9ece71ef0677a1d3468697485db7cbcf1b83745.tar.gz | |
Fix specs
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/builds_controller.rb | 12 | ||||
| -rw-r--r-- | app/models/ci/runner.rb | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb index b7d77c21e72..54c01ddf238 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 = case @scope - when 'all' - @all_builds - when 'finished' - @all_builds.finished - else - @all_builds.running_or_pending + when 'all' + @all_builds + when 'finished' + @all_builds.finished + else + @all_builds.running_or_pending end end diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb index bc5cd137e91..52fdc2578e3 100644 --- a/app/models/ci/runner.rb +++ b/app/models/ci/runner.rb @@ -78,7 +78,7 @@ module Ci end def short_sha - token[0...8] + token[0...8] if token end end end |