Add implementation of manual actions

5 files changed, 51 insertions, 14 deletions

diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index e1b42b2cfa5..efedafefc38 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -39,6 +39,8 @@
           %span.label.label-danger allowed to fail
         - if defined?(retried) && retried
           %span.label.label-warning retried
+        - if build.manual?
+          %span.label.label-info manual
 
 
   - if defined?(runner) && runner
@@ -79,6 +81,11 @@
         - if build.active?
           = link_to cancel_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Cancel', class: 'btn btn-build' do
             = icon('remove', class: 'cred')
-        - elsif defined?(allow_retry) && allow_retry && build.retryable?
-          = link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry', class: 'btn btn-build' do
-            = icon('repeat')
+        - elsif defined?(allow_retry) && allow_retry
+          - if build.retryable?
+            = link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry', class: 'btn btn-build' do
+              = icon('repeat')
+          - elsif build.playable?
+            = link_to play_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry', class: 'btn btn-build' do
+              = icon('play')
+
diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml
index 0557d384e33..1285fce4930 100644
--- a/app/views/projects/ci/pipelines/_pipeline.html.haml
+++ b/app/views/projects/ci/pipelines/_pipeline.html.haml
@@ -57,18 +57,30 @@
   %td.pipeline-actions
     .controls.hidden-xs.pull-right
       - artifacts = pipeline.builds.latest.select { |b| b.artifacts? }
-      - if artifacts.present?
-        .inline
-          .btn-group
-            %a.dropdown-toggle.btn.btn-default.build-artifacts{type: 'button', 'data-toggle' => 'dropdown'}
-              = icon("download")
-              %b.caret
-            %ul.dropdown-menu.dropdown-menu-align-right
-              - artifacts.each do |build|
+      - playable = pipeline.playable_actions
+      - if artifacts.present? || playable.any?
+        .btn-group.inline
+          - if playable.any?
+            .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 download_namespace_project_build_artifacts_path(@project.namespace, @project, build), rel: 'nofollow' do
-                    = icon("download")
-                    %span Download '#{build.name}' artifacts
+                  = link_to play_namespace_project_build_path(@project.namespace, @project, build), rel: 'nofollow' do
+                    = icon("play")
+                    %span= playable.name.titleize
+          - if artifacts.present?
+            .btn-group
+              %a.dropdown-toggle.btn.btn-default.build-artifacts{type: 'button', 'data-toggle' => 'dropdown'}
+                = icon("download")
+                %b.caret
+              %ul.dropdown-menu.dropdown-menu-align-right
+                - artifacts.each do |build|
+                  %li
+                    = link_to download_namespace_project_build_artifacts_path(@project.namespace, @project, build), rel: 'nofollow' do
+                      = icon("download")
+                      %span Download '#{build.name}' artifacts
 
       - if can?(current_user, :update_pipeline, @project)
         .cancel-retry-btns.inline
diff --git a/app/views/projects/deployments/_deployment.html.haml b/app/views/projects/deployments/_deployment.html.haml
index d08dd92f1f6..e430d195ea6 100644
--- a/app/views/projects/deployments/_deployment.html.haml
+++ b/app/views/projects/deployments/_deployment.html.haml
@@ -21,3 +21,5 @@
             Retry
           - else
             Rollback
+
+        = render 'playable', deployment: deployment
diff --git a/app/views/projects/deployments/_playable.html.haml b/app/views/projects/deployments/_playable.html.haml
new file mode 100644
index 00000000000..02e4fb7974e
--- /dev/null
+++ b/app/views/projects/deployments/_playable.html.haml
@@ -0,0 +1,12 @@
+- playable = deployment.playable_actions
+- if playable.any?
+  .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 play_namespace_project_build_path(@project.namespace, @project, build), rel: 'nofollow' do
+            = icon("play")
+            %span= playable.name.titleize
diff --git a/app/views/projects/environments/_environment.html.haml b/app/views/projects/environments/_environment.html.haml
index eafa246d05f..8e517196e27 100644
--- a/app/views/projects/environments/_environment.html.haml
+++ b/app/views/projects/environments/_environment.html.haml
@@ -15,3 +15,7 @@
   %td
     - if last_deployment
       #{time_ago_with_tooltip(last_deployment.created_at)}
+
+  %td
+    - if can?(current_user, :create_deployment, last_deployment) && last_deployment.deployable
+      = render 'projects/deployments/playable', deployment: last_deployment