Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-08-10 17:06:44 +0300
committerFilipa Lacerda <filipa@gitlab.com>2018-08-10 18:48:55 +0300
commit2b36c84176951441ea41d6195a20d33ae6fbf7d5 (patch)
treed7a3cead6d79c0a419f693e2a7c8015eb2944900 /app/views/projects/jobs
parentab44f531995d272e0a85d16a683e92c2e1c2f656 (diff)
Moves terminal button into Vue.
Updates permission checks to use paths instead - backend already handles permissions
Diffstat (limited to 'app/views/projects/jobs')
-rw-r--r--app/views/projects/jobs/_sidebar.html.haml8
1 files changed, 1 insertions, 7 deletions
diff --git a/app/views/projects/jobs/_sidebar.html.haml b/app/views/projects/jobs/_sidebar.html.haml
index 0bc3f107f61..86b2b8bf2f7 100644
--- a/app/views/projects/jobs/_sidebar.html.haml
+++ b/app/views/projects/jobs/_sidebar.html.haml
@@ -1,13 +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: 'pull-right btn btn-primary btn-inverted visible-md-block visible-lg-block', target: '_blank' do
- Debug
- = icon('external-link')
-
- #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