summaryrefslogtreecommitdiff
path: root/app/models/deployment.rb
diff options
context:
space:
mode:
authorPawel Chojnacki <pawel@chojnacki.ws>2017-05-09 22:24:24 +0200
committerPawel Chojnacki <pawel@chojnacki.ws>2017-05-11 23:07:12 +0200
commit693602d957b2bb48a5270d249a2e2708c03bd803 (patch)
treef68006a9b15cf54fde168ae9997796994bb60ed5 /app/models/deployment.rb
parent4f824d2aecf4fec46febd767fa7f7d747c732112 (diff)
downloadgitlab-ce-693602d957b2bb48a5270d249a2e2708c03bd803.tar.gz
Keep presentation logic in one place and remove unecessary arguments.
+ fix tests
Diffstat (limited to 'app/models/deployment.rb')
-rw-r--r--app/models/deployment.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index f4751dc5334..216cec751e3 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -106,8 +106,7 @@ class Deployment < ActiveRecord::Base
def metrics
return {} unless has_metrics?
- metrics = project.monitoring_service.deployment_metrics(self)
- metrics&.merge(deployment_time: created_at.to_i) || {}
+ project.monitoring_service.deployment_metrics(self)
end
private