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
This commit is contained in:
commit
1bf57b7511
|
@ -129,6 +129,8 @@
|
|||
}
|
||||
|
||||
.cancel-retry-btns {
|
||||
vertical-align: middle;
|
||||
|
||||
.btn:not(:first-child) {
|
||||
margin-left: 8px;
|
||||
}
|
||||
|
|
|
@ -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")
|
||||
|
|
Loading…
Reference in New Issue