summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryce Johnson <bryce@gitlab.com>2016-10-01 14:33:52 +0200
committerBryce Johnson <bryce@gitlab.com>2016-10-06 16:05:23 +0200
commita483477091d0ffd2a39bc310bf18aa12796fc69e (patch)
tree0b435bc49d24b6181e814f2e788294ba0ebd47ec
parent9802d3883fb42dd31f91d71018ac87ba0c32d1c1 (diff)
downloadgitlab-ce-a483477091d0ffd2a39bc310bf18aa12796fc69e.tar.gz
Only hide deploy status external link on small screens.
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/projects/merge_requests/widget/_heading.html.haml4
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0ebf9084e6a..58690a0453f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -51,6 +51,7 @@ v 8.13.0 (unreleased)
- Update ruby-prof to 0.16.2. !6026 (Elan Ruusamäe)
- Fix unnecessary escaping of reserved HTML characters in milestone title. !6533
- Add organization field to user profile
+ - Fix deploy status responsiveness error !6633
- Fix resolved discussion display in side-by-side diff view !6575
- Optimize GitHub importing for speed and memory
- API: expose pipeline data in builds API (!6502, Guilherme Salazar)
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml
index b5f5e11d4c3..7ba590d4ff5 100644
--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
@@ -49,11 +49,11 @@
.mr-widget-heading
.ci_widget.ci-success
= ci_icon_for_status("success")
- %span.hidden-sm
+ %span
Deployed to
= succeed '.' do
= link_to environment.name, environment_path(environment), class: 'environment'
- external_url = environment.external_url
- if external_url
- = link_to external_url, target: '_blank' do
+ = link_to external_url, target: '_blank', class: 'hidden-xs' do
= icon('external-link', text: "View on #{external_url.gsub(/\A.*?:\/\//, '')}", right: true)