kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '64091-fix-broken-terminal' into 'master'

Browse source 
Fix broken environments terminal

See merge request gitlab-org/gitlab-ce!30401
This commit is contained in:
Filipa Lacerda 2019-07-11 14:25:19 +00:00
commit 3b42339068
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/views/projects/environments/show.html.haml
View file

@ -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 }

5
changelogs/unreleased/64091-fix-broken-terminal.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Fix environments broken terminal
merge_request: 30401
author:
type: fixed