diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-10-12 14:50:00 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-10-12 14:50:00 +0200 |
| commit | 6761257bd5394b32e7aae7cf7486f13537c2aa43 (patch) | |
| tree | 2f32503f0b303a27d25f2f15a07e0053d094968b | |
| parent | 0431f8bf3848779a5b685401e2967658a74271d2 (diff) | |
| download | gitlab-ce-6761257bd5394b32e7aae7cf7486f13537c2aa43.tar.gz | |
Fix terminal support
4 files changed, 7 insertions, 4 deletions
diff --git a/app/views/projects/deployments/_actions.haml b/app/views/projects/deployments/_actions.haml index 5764d9b19df..373db9b665c 100644 --- a/app/views/projects/deployments/_actions.haml +++ b/app/views/projects/deployments/_actions.haml @@ -5,7 +5,7 @@ = link_to external_url, target: '_blank', class: 'btn external-url' do = icon('external-link') - - if can?(current_user, :update_deployment, deployment) && deployment.deployable + - if can?(current_user, :update_deployment, deployment) && deployment.deployable && local_assigns.fetch(:show_terminal, false) = link_to terminal_namespace_project_deployment_path(@project.namespace.becomes(Namespace), @project, deployment), class: 'btn btn-default btn-terminal', rel: 'nofollow' do = custom_icon('icon_terminal') diff --git a/app/views/projects/deployments/_deployment.html.haml b/app/views/projects/deployments/_deployment.html.haml index 05dabe11871..6187744430f 100644 --- a/app/views/projects/deployments/_deployment.html.haml +++ b/app/views/projects/deployments/_deployment.html.haml @@ -17,4 +17,5 @@ #{time_ago_with_tooltip(deployment.created_at)} %td.hidden-xs - = render 'projects/deployments/actions', deployment: deployment, allow_rollback: true, show_actions: true + = render 'projects/deployments/actions', deployment: deployment, allow_rollback: true, + show_actions: true, show_terminal: deployment.environment.opened? diff --git a/app/views/projects/deployments/terminal.html.haml b/app/views/projects/deployments/terminal.html.haml index 168ac9979cb..de283725efb 100644 --- a/app/views/projects/deployments/terminal.html.haml +++ b/app/views/projects/deployments/terminal.html.haml @@ -15,4 +15,5 @@ Environment: %a{href: '#'} add information - #terminal{data:{project_path: "#{project_path(@project)}/deployments/#{@deployment.id}/terminal_websocket"}} + + #terminal{data:{project_path: "#{terminal_namespace_project_deployment_path(@project.namespace, @project, @deployment)}_websocket"}} diff --git a/app/views/projects/environments/_environment.html.haml b/app/views/projects/environments/_environment.html.haml index 760bca572c9..a995a49023d 100644 --- a/app/views/projects/environments/_environment.html.haml +++ b/app/views/projects/environments/_environment.html.haml @@ -30,4 +30,5 @@ %td.hidden-xs = render 'projects/deployments/actions', deployment: last_deployment, allow_close: environment.opened?, allow_rollback: environment.closed?, - show_external_url: environment.opened?, show_actions: environment.opened? + show_external_url: environment.opened?, show_actions: environment.opened?, + show_terminal: environment.opened? |