diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-11-07 05:21:25 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-11-07 05:21:25 +0000 |
| commit | 839a654ef0da5f13729074e24231344fe64a2cdc (patch) | |
| tree | 6dff019a9ea6164af7c9721ca2cb2ba30b886002 /app/models/environment_status.rb | |
| parent | 0a4eeafb43236359c55e221bdc8cab52acef9a0f (diff) | |
| parent | cf8fe12b7b3a24082db47f71c80b01e62e391f32 (diff) | |
| download | gitlab-ce-gl-ui-loading-icon.tar.gz | |
Merge branch 'master' into 'gl-ui-loading-icon'gl-ui-loading-icon
# Conflicts:
# app/assets/javascripts/jobs/components/job_app.vue
Diffstat (limited to 'app/models/environment_status.rb')
| -rw-r--r-- | app/models/environment_status.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/models/environment_status.rb b/app/models/environment_status.rb index a84871f7253..7efc8da09ad 100644 --- a/app/models/environment_status.rb +++ b/app/models/environment_status.rb @@ -8,8 +8,8 @@ class EnvironmentStatus delegate :id, to: :environment delegate :name, to: :environment delegate :project, to: :environment + delegate :status, to: :deployment, allow_nil: true delegate :deployed_at, to: :deployment, allow_nil: true - delegate :status, to: :deployment def self.for_merge_request(mr, user) build_environments_status(mr, user, mr.head_pipeline) @@ -33,10 +33,6 @@ class EnvironmentStatus end end - def deployed_at - deployment&.created_at - end - def changes return [] if project.route_map_for(sha).nil? |