diff options
| author | Phil Hughes <me@iamphill.com> | 2018-08-13 10:17:36 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-08-13 10:17:36 +0000 |
| commit | d22b477d6f4b95455abd7bed8257c64d5f1daa72 (patch) | |
| tree | 90153281f46d2679aeca61439dbfe7fa63a5550f /app/views/projects | |
| parent | 6d9824c822772decf9a783ee4d1ad40e2ac64e9e (diff) | |
| parent | 8d233e39f6a239011a9b8f69005a5c4915ceb262 (diff) | |
| download | gitlab-ce-d22b477d6f4b95455abd7bed8257c64d5f1daa72.tar.gz | |
Merge branch '25990-web-terminal-improvements' into 'master'
Improve terminal button on job log page
See merge request gitlab-org/gitlab-ce!21094
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/jobs/_sidebar.html.haml | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/views/projects/jobs/_sidebar.html.haml b/app/views/projects/jobs/_sidebar.html.haml index 759efd4e9d4..86b2b8bf2f7 100644 --- a/app/views/projects/jobs/_sidebar.html.haml +++ b/app/views/projects/jobs/_sidebar.html.haml @@ -1,12 +1,7 @@ %aside.right-sidebar.right-sidebar-expanded.build-sidebar.js-build-sidebar.js-right-sidebar{ data: { "offset-top" => "101", "spy" => "affix" } } .sidebar-container .blocks-container - - if can?(current_user, :create_build_terminal, @build) - .block - = link_to terminal_project_job_path(@project, @build), class: 'terminal-button pull-right btn visible-md-block visible-lg-block', title: 'Terminal' do - Terminal - - #js-details-block-vue{ data: { can_user_retry: can?(current_user, :update_build, @build) && @build.retryable? } } + #js-details-block-vue{ data: { terminal_path: can?(current_user, :create_build_terminal, @build) && @build.has_terminal? ? terminal_project_job_path(@project, @build) : nil } } - if can?(current_user, :read_build, @project) && (@build.artifacts? || @build.artifacts_expired?) .block |