diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-25 08:49:49 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-26 12:11:51 -0500 |
| commit | b7f66d1af1b4759d2fd11e820e43454d57ad84fd (patch) | |
| tree | 43356644aa5a61440c7d73c9a027c0ece1510f44 /app | |
| parent | 2fc359a506b5997cb65b6d5f2f5c85df98fd1c69 (diff) | |
| download | gitlab-ce-b7f66d1af1b4759d2fd11e820e43454d57ad84fd.tar.gz | |
Add retry build button in page header, remove from sidebar
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/builds.scss | 8 | ||||
| -rw-r--r-- | app/views/projects/builds/_header.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/builds/_sidebar.html.haml | 2 |
3 files changed, 2 insertions, 10 deletions
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss index d6a55fbd464..b40ecd09e09 100644 --- a/app/assets/stylesheets/pages/builds.scss +++ b/app/assets/stylesheets/pages/builds.scss @@ -135,14 +135,6 @@ } } - .retry-link { - color: $gl-link-color; - - &:hover { - text-decoration: underline; - } - } - .stage-item { cursor: pointer; diff --git a/app/views/projects/builds/_header.html.haml b/app/views/projects/builds/_header.html.haml index 51b5bd9db42..c276734a2e6 100644 --- a/app/views/projects/builds/_header.html.haml +++ b/app/views/projects/builds/_header.html.haml @@ -12,5 +12,7 @@ - if @build.user = render "user" = time_ago_with_tooltip(@build.created_at) + - if can?(current_user, :update_build, @build) && @build.retryable? + = link_to "Retry", retry_namespace_project_build_path(@project.namespace, @project, @build), class: 'btn btn-white pull-right', method: :post %button.btn.btn-default.pull-right.visible-xs-block.visible-sm-block.build-gutter-toggle.js-sidebar-build-toggle{ role: "button", type: "button" } = icon('angle-double-left') diff --git a/app/views/projects/builds/_sidebar.html.haml b/app/views/projects/builds/_sidebar.html.haml index b1053028279..2835206ccfa 100644 --- a/app/views/projects/builds/_sidebar.html.haml +++ b/app/views/projects/builds/_sidebar.html.haml @@ -43,8 +43,6 @@ .block{ class: ("block-first" if !@build.coverage && !(can?(current_user, :read_build, @project) && (@build.artifacts? || @build.artifacts_expired?))) } .title Build details - - if can?(current_user, :update_build, @build) && @build.retryable? - = link_to "Retry", retry_namespace_project_build_path(@project.namespace, @project, @build), class: 'pull-right retry-link', method: :post - if @build.merge_request %p.build-detail-row %span.build-light-text Merge Request: |