summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-10-17 18:45:12 +0900
committerShinya Maeda <shinya@gitlab.com>2018-10-17 18:45:12 +0900
commit4d8d4349ea9210dbc0a4d81bd21beb9132e1b3e0 (patch)
tree461d6dce55b881de818b6cf3acf6774ef6a39b4c
parent17faf82267b5ae456686ac3f3865b6c5659096a6 (diff)
parent5c723d8572dc3060773b50324b5c0f18d97f4124 (diff)
downloadgitlab-ce-use-deployment-status-in-job-log-page.tar.gz
Merge branch 'deployment-status-presenter' into use-deployment-status-in-job-log-pageuse-deployment-status-in-job-log-page
-rw-r--r--lib/gitlab/ci/status/deployment/common.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/gitlab/ci/status/deployment/common.rb b/lib/gitlab/ci/status/deployment/common.rb
index 64bb7c4e032..10d9de000bc 100644
--- a/lib/gitlab/ci/status/deployment/common.rb
+++ b/lib/gitlab/ci/status/deployment/common.rb
@@ -25,7 +25,11 @@ module Gitlab
end
def external_url
- subject.environment.external_url
+ environment.external_url
+ end
+
+ def external_url_formatted
+ environment.formatted_external_url
end
def stop_url
@@ -64,6 +68,10 @@ module Gitlab
def deployable
subject.deployable
end
+
+ def has_deployment?
+ true
+ end
end
end
end