diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-07-17 18:13:22 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-07-17 18:13:22 +0000 |
| commit | 1bf57b75119deb79f5826245d4c69a0a83cc4864 (patch) | |
| tree | 40a4203c479ae4bfca619fe693b373531c5022fa | |
| parent | 7a7ecbeacdb928cd53aa6ce61c7a569c928e4666 (diff) | |
| parent | e72fe97e42c1a97bd6fd305a61e90dbb193c9f45 (diff) | |
| download | gitlab-ce-1bf57b75119deb79f5826245d4c69a0a83cc4864.tar.gz | |
Merge branch '19907-deploy' into 'master'
Resolve "Pipelines view has manual actions"
## What does this MR do?
Removes the deploy button from pipelines
## Why was this MR needed?
The button didn't do anything
## What are the relevant issue numbers?
Closes #19907
## Screenshots (if relevant)
<img src="/uploads/9488cf238f67463f7dac8f9dbc34f7e1/Screen_Shot_2016-07-16_at_5.52.10_PM.png" width="300px">
See merge request !5299
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/ci/pipelines/_pipeline.html.haml | 13 |
2 files changed, 4 insertions, 11 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 08da4e290dc..a0334207c68 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -129,6 +129,8 @@ } .cancel-retry-btns { + vertical-align: middle; + .btn:not(:first-child) { margin-left: 8px; } diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index b53a8633937..631873fb0a3 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -58,16 +58,7 @@ .controls.hidden-xs.pull-right - artifacts = pipeline.builds.latest.select { |b| b.artifacts? } - if artifacts.present? - .btn-group.inline - .btn-group - %a.dropdown-toggle.btn.btn-default{type: 'button', 'data-toggle' => 'dropdown'} - = icon("play") - %b.caret - %ul.dropdown-menu.dropdown-menu-align-right - %li - = link_to '#' do - = icon("play") - %span Deploy to production + .inline .btn-group %a.dropdown-toggle.btn.btn-default.build-artifacts{type: 'button', 'data-toggle' => 'dropdown'} = icon("download") @@ -80,7 +71,7 @@ %span Download '#{build.name}' artifacts - if can?(current_user, :update_pipeline, @project) - .cancel-retry-btns + .cancel-retry-btns.inline - if pipeline.retryable? = link_to retry_namespace_project_pipeline_path(@project.namespace, @project, pipeline.id), class: 'btn has-tooltip', title: "Retry", method: :post do = icon("repeat") |