diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-10-17 13:02:02 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-10-17 13:02:02 +0200 |
| commit | 63312b9860e6b8d46b7e8ca60cbf4954398ce0c4 (patch) | |
| tree | e038f56b9dce338a8401f01e9d7887eb80098c73 /app/assets | |
| parent | 53d79469b0dd2b3c054dabe685231747352aee9f (diff) | |
| parent | a8cc76e2a82ed225b246a31d45d41d5ca52a529e (diff) | |
| download | gitlab-ce-63312b9860e6b8d46b7e8ca60cbf4954398ce0c4.tar.gz | |
Merge branch '22191-delete-dynamic-envs-mr' of gitlab.com:gitlab-org/gitlab-ce into 22191-delete-dynamic-envs-mr
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.es6 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.es6 b/app/assets/javascripts/merge_request_widget.js.es6 index fcadc4bc515..fb55d13a223 100644 --- a/app/assets/javascripts/merge_request_widget.js.es6 +++ b/app/assets/javascripts/merge_request_widget.js.es6 @@ -17,6 +17,12 @@ View on <%- external_url_formatted %> </a> </span> + <span class="close-env-container js-close-env-link"> + <a href="<%- stop_url %>" class="close-evn-link" data-method="post" rel="nofollow" data-confirm="Are you sure you want to close this environment?"> + <i class="fa fa-stop-circle-o"/> + Stop environment + </a> + </span> </div> </div>`; @@ -205,6 +211,11 @@ if ($(`.mr-state-widget #${ environment.id }`).length) return; const $template = $(DEPLOYMENT_TEMPLATE); if (!environment.external_url || !environment.external_url_formatted) $('.js-environment-link', $template).remove(); + + if (!environment.stop_url) { + $('.js-close-env-link', $template).remove(); + } + if (environment.deployed_at && environment.deployed_at_formatted) { environment.deployed_at = $.timeago(environment.deployed_at) + '.'; } else { |