diff options
| author | Phil Hughes <me@iamphill.com> | 2018-09-17 15:36:12 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-09-17 15:36:12 +0300 |
| commit | 99c3d45e6f56ff5fef8b2ad03b1bad25f66419eb (patch) | |
| tree | b5a92911b51c8a43ff2a1b6179080b1d80417c5c /app | |
| parent | 983bd38f9189a5c7c470f76f7a83044ec7259d21 (diff) | |
| parent | 5dc3504be3d0826080b1640dd9d827dcc3601bd0 (diff) | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/environments/terminal.html.haml | 2 |
1 files changed, 1 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 |