summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Erasmus <jerasmus@gitlab.com>2019-07-11 14:25:18 +0000
committerFilipa Lacerda <filipa@gitlab.com>2019-07-11 14:25:18 +0000
commit4be9ff8442652cd83beb3e70af09458967d86486 (patch)
tree733cc375952fc852926d13da144a41671cbea1a5
parente1a56e7b229d7faa4986df557e6c6651de3e7f91 (diff)
downloadgitlab-ce-4be9ff8442652cd83beb3e70af09458967d86486.tar.gz
Load terminal css file in environments page
Loaded the xterm css file in order to fix the styling issues
-rw-r--r--app/views/projects/environments/show.html.haml3
-rw-r--r--changelogs/unreleased/64091-fix-broken-terminal.yml5
2 files changed, 8 insertions, 0 deletions
diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml
index c13a47b0b09..6100fd3ad37 100644
--- a/app/views/projects/environments/show.html.haml
+++ b/app/views/projects/environments/show.html.haml
@@ -3,6 +3,9 @@
- breadcrumb_title @environment.name
- page_title _("Environments")
+- content_for :page_specific_javascripts do
+ = stylesheet_link_tag 'page_bundles/xterm'
+
%div{ class: container_class }
- if can?(current_user, :stop_environment, @environment)
#stop-environment-modal.modal.fade{ tabindex: -1 }
diff --git a/changelogs/unreleased/64091-fix-broken-terminal.yml b/changelogs/unreleased/64091-fix-broken-terminal.yml
new file mode 100644
index 00000000000..156f6de5008
--- /dev/null
+++ b/changelogs/unreleased/64091-fix-broken-terminal.yml
@@ -0,0 +1,5 @@
+---
+title: Fix environments broken terminal
+merge_request: 30401
+author:
+type: fixed