Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-09-17 13:32:01 +0300
committerFilipa Lacerda <filipa@gitlab.com>2018-09-17 14:16:05 +0300
commit5dc3504be3d0826080b1640dd9d827dcc3601bd0 (patch)
tree0330f74b115ec8a855cacd08c5ca52512b7f6d3d
parent78b3eea7d248c6d3c48b615c9df24a95cb5fd1d8 (diff)
Include correct CSS file for xterm in environments page
When the xterm dependency was moved to a npm dependency the CSS file path was not updated correctly in the environments page. In order for xterm to render properly, it needs the correct CSS path.
-rw-r--r--app/views/projects/environments/terminal.html.haml2
-rw-r--r--changelogs/unreleased/50956-web-terminal.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/projects/environments/terminal.html.haml b/app/views/projects/environments/terminal.html.haml
index 5b680189bc8..e40d631a1a1 100644
--- a/app/views/projects/environments/terminal.html.haml
+++ b/app/views/projects/environments/terminal.html.haml
@@ -2,7 +2,7 @@
- page_title "Terminal for environment", @environment.name
- content_for :page_specific_javascripts do
- = stylesheet_link_tag "xterm/xterm"
+ = stylesheet_link_tag "xterm.css"
%div{ class: container_class }
.top-area
diff --git a/changelogs/unreleased/50956-web-terminal.yml b/changelogs/unreleased/50956-web-terminal.yml
new file mode 100644
index 00000000000..73317b0224c
--- /dev/null
+++ b/changelogs/unreleased/50956-web-terminal.yml
@@ -0,0 +1,5 @@
+---
+title: Include correct CSS file for xterm in environments page
+merge_request:
+author:
+type: fixed