diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-04-06 22:16:28 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-06 22:16:28 +0300 |
| commit | e28fc7b1d366e044cd2f90fe54590966688709c5 (patch) | |
| tree | 493c7b5dbd39573c38f81a9c047dcb144eb835ab /app/views/projects/ci/builds/_build.html.haml | |
| parent | 5a4aee36a5bfd615475aae80d9549855b46a098c (diff) | |
| parent | bc3b0418b62f3f7460a4e46f1e43b07612e72f7d (diff) | |
Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits_if_not_head
* upstream/master: (197 commits)
Add text to break up diagrams
Implement review comments from @DouweM for !10467.
Fix rubocop offence
Linking to edit file directly
Optimise trace handling code to use streaming instead of full read
Use config.toml to configure Gitaly
Fix indexes in container repositories table
Recent search history for issues
Fix rubocop
Use change direction in spec
Use be_pending
Improve trigger_schedule.rb
Implement a offset calculation on cron_parser_spec
Clean up trigger_schedule_worker_spec.rb
Improve instantiate recursion in cron_parser.rb
Fix unnecessary changes in schema.rb
Add empty line in cron_parser.rb
Use parenthesis for respond_to :ref
Define next_time as let in trigger_schedule_spec
Remove next_run_at: nil from trigger_schedule_spec
...
Diffstat (limited to 'app/views/projects/ci/builds/_build.html.haml')
| -rw-r--r-- | app/views/projects/ci/builds/_build.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index 238662f1125..4700b7a9a45 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -6,7 +6,6 @@ - retried = local_assigns.fetch(:retried, false) - pipeline_link = local_assigns.fetch(:pipeline_link, false) - stage = local_assigns.fetch(:stage, false) -- coverage = local_assigns.fetch(:coverage, false) - allow_retry = local_assigns.fetch(:allow_retry, false) %tr.build.commit{ class: ('retried' if retried) } @@ -90,7 +89,7 @@ %span= time_ago_with_tooltip(job.finished_at) %td.coverage - - if coverage && job.try(:coverage) + - if job.try(:coverage) #{job.coverage}% %td |