diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-19 13:43:06 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-19 13:43:06 -0500 |
| commit | cefeeaea3364c52afc8077c6eaa8914a4bb27852 (patch) | |
| tree | 03c1100e2636510f89982b4a3473e868a3745eab /app/views/projects/jobs | |
| parent | 59d6161e1ea5f4650fe45a0f6bd2e45bb061f6e1 (diff) | |
| parent | b1e9d98a29605daf7ccdd0e324dd399fdebfee41 (diff) | |
| download | gitlab-ce-cefeeaea3364c52afc8077c6eaa8914a4bb27852.tar.gz | |
Merge branch 'master' into bootstrap4
Diffstat (limited to 'app/views/projects/jobs')
| -rw-r--r-- | app/views/projects/jobs/_sidebar.html.haml | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/app/views/projects/jobs/_sidebar.html.haml b/app/views/projects/jobs/_sidebar.html.haml index bc795c69f05..eaf8fc43e6c 100644 --- a/app/views/projects/jobs/_sidebar.html.haml +++ b/app/views/projects/jobs/_sidebar.html.haml @@ -1,15 +1,8 @@ %aside.right-sidebar.right-sidebar-expanded.build-sidebar.js-build-sidebar.js-right-sidebar{ data: { "offset-top" => "101", "spy" => "affix" } } .sidebar-container .blocks-container - .block - %strong.inline.prepend-top-8 - = @build.name - - if can?(current_user, :update_build, @build) && @build.retryable? - = link_to "Retry", retry_namespace_project_job_path(@project.namespace, @project, @build), class: 'js-retry-button float-right btn btn-inverted-secondary btn-retry d-block d-lg-none d-xl-none', method: :post - %a.gutter-toggle.float-right.d-block.d-sm-none.d-md-none.js-sidebar-build-toggle{ href: "#", 'aria-label': 'Toggle Sidebar', role: 'button' } - = icon('angle-double-right') - #js-details-block-vue + #js-details-block-vue{ data: { can_user_retry: can?(current_user, :update_build, @build) && @build.retryable? } } - if can?(current_user, :read_build, @project) && (@build.artifacts? || @build.artifacts_expired?) .block |