From 92d12fab66e66358e8fb9204870053e4bab66b71 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 17 Oct 2016 11:44:08 +0100
Subject: Updates MR template to include stop link

---
 app/assets/javascripts/merge_request_widget.js.es6 | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'app/assets/javascripts')

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 {
-- 
cgit v1.2.1


From 9b790f1cf97157240178601c62d2e557a404503e Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 17 Oct 2016 16:13:19 +0200
Subject: Improve after code review

---
 app/assets/javascripts/merge_request_widget.js.es6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/merge_request_widget.js.es6 b/app/assets/javascripts/merge_request_widget.js.es6
index fb55d13a223..639859ab96f 100644
--- a/app/assets/javascripts/merge_request_widget.js.es6
+++ b/app/assets/javascripts/merge_request_widget.js.es6
@@ -18,7 +18,7 @@
            </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?">
+          <a href="<%- stop_url %>" class="close-evn-link" data-method="post" rel="nofollow" data-confirm="Are you sure you want to stop this environment?">
             <i class="fa fa-stop-circle-o"/>
             Stop environment
           </a>
-- 
cgit v1.2.1


From c3cf103fee47c056c7258d2921a34cf68a02022c Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 17 Oct 2016 22:10:43 +0100
Subject: Updates class name for consistency

---
 app/assets/javascripts/merge_request_widget.js.es6 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/merge_request_widget.js.es6 b/app/assets/javascripts/merge_request_widget.js.es6
index 639859ab96f..3ff6851d59b 100644
--- a/app/assets/javascripts/merge_request_widget.js.es6
+++ b/app/assets/javascripts/merge_request_widget.js.es6
@@ -17,7 +17,7 @@
              View on <%- external_url_formatted %>
            </a>
          </span>
-         <span class="close-env-container js-close-env-link">
+         <span class="stop-env-container js-stop-env-link">
           <a href="<%- stop_url %>" class="close-evn-link" data-method="post" rel="nofollow" data-confirm="Are you sure you want to stop this environment?">
             <i class="fa fa-stop-circle-o"/>
             Stop environment
@@ -213,7 +213,7 @@
         if (!environment.external_url || !environment.external_url_formatted) $('.js-environment-link', $template).remove();
         
         if (!environment.stop_url) {
-          $('.js-close-env-link', $template).remove();
+          $('.js-stop-env-link', $template).remove();
         }
         
         if (environment.deployed_at && environment.deployed_at_formatted) {
-- 
cgit v1.2.1