Rename to total_duration and we're not using CommitStatus.duration

3 files changed, 3 insertions, 9 deletions

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index a57ae0085ca..19335ccea57 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -78,7 +78,7 @@ module Ci
       CommitStatus.where(pipeline: pluck(:id)).stages
     end
 
-    def self.duration
+    def self.total_duration
       where.not(duration: nil).sum(:duration)
     end
 
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index ac589fa2e31..9e1e9b76ce4 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -103,11 +103,6 @@ class CommitStatus < ActiveRecord::Base
     end
   end
 
-  def self.duration
-    select(:started_at, :finished_at).all.
-      map(&:duration).compact.inject(0, &:+)
-  end
-
   def ignored?
     allow_failure? && (failed? || canceled?)
   end
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 3ad866bb2f1..f733d49224e 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -57,9 +57,8 @@
     = link_to builds_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "ci-status-link ci-status-icon-#{@commit.status}" do
       = ci_icon_for_status(@commit.status)
       = ci_label_for_status(@commit.status)
-    - if @commit.pipelines.duration
-      in
-      = time_interval_in_words @commit.pipelines.duration
+    in
+    = time_interval_in_words @commit.pipelines.total_duration
 
 .commit-box.content-block
   %h3.commit-title