Automatic merge of gitlab-org/gitlab-ce master

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 }

changelogs/unreleased/64091-fix-broken-terminal.yml

+---
+title: Fix environments broken terminal
+merge_request: 30401
+author:
+type: fixed