Fix review commentsfix-commit-status-rendering

- 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

2 files changed, 6 insertions, 2 deletions

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