From 16592e2b45d42e22f9d1d595a1f44821c7b30441 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Mon, 14 Mar 2016 13:33:26 +0100 Subject: Fix review comments - Remove unused Gitlab::Application.routes.url_helpers from Ci::Build - Remove too much logic from a view, use Ci::Commit.matrix_builds - Use ci_status_with_icon - Don't describe symbols --- app/models/ci/build.rb | 2 -- app/models/ci/commit.rb | 6 ++++++ app/views/projects/builds/show.html.haml | 2 +- app/views/projects/ci/builds/_build.html.haml | 3 +-- .../generic_commit_statuses/_generic_commit_status.html.haml | 3 +-- 5 files changed, 9 insertions(+), 7 deletions(-) (limited to 'app') diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 6c1ca8db24f..7d33838044b 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -37,8 +37,6 @@ module Ci class Build < CommitStatus - include Gitlab::Application.routes.url_helpers - LAZY_ATTRIBUTES = ['trace'] belongs_to :runner, class_name: 'Ci::Runner' diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb index 12c60158d46..f4cf7034b14 100644 --- a/app/models/ci/commit.rb +++ b/app/models/ci/commit.rb @@ -113,6 +113,12 @@ module Ci latest_statuses.select { |status| status.ref == ref } end + def matrix_builds(build = nil) + matrix_builds = builds.latest.ordered + matrix_builds = matrix_builds.similar(build) if build + matrix_builds.to_a + end + def retried @retried ||= (statuses.order(id: :desc) - statuses.latest) end diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml index dbbf382fa2a..b02aee3db21 100644 --- a/app/views/projects/builds/show.html.haml +++ b/app/views/projects/builds/show.html.haml @@ -13,7 +13,7 @@ = link_to "merge request ##{merge_request.iid}", merge_request_path(merge_request) #up-build-trace - - builds = @build.commit.builds.similar(@build).latest.ordered.to_a + - builds = @build.commit.matrix_builds(@build) - if builds.size > 1 %ul.nav-links.no-top.no-bottom - builds.each do |build| diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index 195fd4a9d51..7123efffd5b 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -2,8 +2,7 @@ %td.status - if can?(current_user, :read_build, build) = link_to namespace_project_build_url(build.project.namespace, build.project, build), class: "ci-status ci-#{build.status}" do - = ci_icon_for_status(build.status) - = build.status + = ci_status_with_icon(build.status) - else = ci_status_with_icon(build.status) diff --git a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml index ac29f323b4c..4143ea13063 100644 --- a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml +++ b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml @@ -2,8 +2,7 @@ %td.status - if can?(current_user, :read_commit_status, generic_commit_status) && generic_commit_status.target_url = link_to generic_commit_status.target_url, class: "ci-status ci-#{generic_commit_status.status}" do - = ci_icon_for_status(generic_commit_status.status) - = generic_commit_status.status + = ci_status_with_icon(generic_commit_status.status) - else = ci_status_with_icon(generic_commit_status.status) -- cgit v1.2.1