Merge branch '50956-web-terminal' into 'master'

Include correct CSS file for xterm in environments page Closes #50956 See merge request gitlab-org/gitlab-ce!21768
2018-09-17 12:36:12 +00:00 · 2018-09-17 12:36:12 +00:00 · 99c3d45e6f
parent 983bd38f91 5dc3504be3
commit 99c3d45e6f
2 changed files with 6 additions and 1 deletions
--- 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
--- a/changelogs/unreleased/50956-web-terminal.yml
+++ 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