Cleanup GitLab CI UIci-build-list

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

3 files changed, 22 insertions, 37 deletions

diff --git a/app/helpers/ci/application_helper.rb b/app/helpers/ci/application_helper.rb
index 7e880b00b3a..9fe6282bb81 100644
--- a/app/helpers/ci/application_helper.rb
+++ b/app/helpers/ci/application_helper.rb
@@ -28,5 +28,27 @@ module Ci
         "#{pluralize(seconds, "second")}"
       end
     end
+
+    def ci_icon_for_status(status)
+      icon_name =
+        case status
+        when 'success'
+          'check-square'
+        when 'failed'
+          'close'
+        when 'running', 'pending'
+          'clock-o'
+        else
+          'circle'
+        end
+
+      icon(icon_name)
+    end
+
+    def ci_status_with_icon(status)
+      content_tag :span, class: "ci-status ci-#{status}" do
+        ci_icon_for_status(status) + ' '.html_safe + status
+      end
+    end
   end
 end
diff --git a/app/helpers/ci/builds_helper.rb b/app/helpers/ci/builds_helper.rb
index 422994f5984..5d6e785d951 100644
--- a/app/helpers/ci/builds_helper.rb
+++ b/app/helpers/ci/builds_helper.rb
@@ -15,27 +15,5 @@ module Ci
     def build_url(build)
       ci_project_build_url(build.project, build)
     end
-
-    def build_status_css_class(build)
-      if build.success?
-        'build-success'
-      elsif build.failed?
-        'build-danger'
-      elsif build.canceled?
-        'build-disabled'
-      else
-        'build-warning'
-      end
-    end
-
-    def build_icon_css_class(build)
-      if build.success?
-        'fa-circle cgreen'
-      elsif build.failed?
-        'fa-circle cred'
-      else
-        'fa-circle light'
-      end
-    end
   end
 end
diff --git a/app/helpers/ci/commits_helper.rb b/app/helpers/ci/commits_helper.rb
index 2c86bbffa36..9069aed5b4d 100644
--- a/app/helpers/ci/commits_helper.rb
+++ b/app/helpers/ci/commits_helper.rb
@@ -1,20 +1,5 @@
 module Ci
   module CommitsHelper
-    def commit_status_css_class(commit)
-      return 'build-info' unless commit
-
-      case commit.status
-      when 'success'
-        'build-success'
-      when 'failed', 'canceled'
-        'build-danger'
-      when 'skipped'
-        'build-disabled'
-      else
-        'build-warning'
-      end
-    end
-
     def ci_commit_path(commit)
       ci_project_ref_commits_path(commit.project, commit.ref, commit.sha)
     end