From 735b2b5769cb170b466bd2f5ddc116a997ac75a5 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 4 Oct 2016 10:45:42 +0100
Subject: [PATCH] Adds link to close environment in a merge request
---
app/assets/stylesheets/pages/merge_requests.scss | 9 +++++++++
.../projects/merge_requests/widget/_heading.html.haml | 3 +++
2 files changed, 12 insertions(+)
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index bc8693ae467..f2c2e06ad3e 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -177,6 +177,15 @@
.ci-coverage {
float: right;
}
+
+ .close-env-container {
+ color: $gl-text-color;
+ float: right;
+
+ a {
+ color: $gl-text-color;
+ }
+ }
}
.mr_source_commit,
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml
index b5f5e11d4c3..c56283836a9 100644
--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
@@ -57,3 +57,6 @@
- if external_url
= link_to external_url, target: '_blank' do
= icon('external-link', text: "View on #{external_url.gsub(/\A.*?:\/\//, '')}", right: true)
+ %span.close-env-container
+ = link_to '#', class: 'close-evn-link' do
+ = icon('stop-circle-o', text: 'Stop environment')
\ No newline at end of file
--
GitLab