diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-01-15 16:10:51 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-01-15 16:10:51 +0300 |
| commit | 15e12fd95feab8a9e0e1514e6aa81e3b52851a13 (patch) | |
| tree | 4b83ccbf5e2466bf5415506d305b4ea26cc98269 /app | |
| parent | d80b513518636f6fe74ac969540a4e1ac41012a2 (diff) | |
| parent | cd56625a0e1c4126890c65cade986353dcac602b (diff) | |
Merge branch '41970-job-play-button' into 'master'
Resolve "Empty state for manual job - play button does not work"
Closes #41970
See merge request gitlab-org/gitlab-ce!16426
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/jobs/_empty_state.html.haml | 5 | ||||
| -rw-r--r-- | app/views/projects/jobs/show.html.haml | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/views/projects/jobs/_empty_state.html.haml b/app/views/projects/jobs/_empty_state.html.haml index c66313bdbf3..311934d9c33 100644 --- a/app/views/projects/jobs/_empty_state.html.haml +++ b/app/views/projects/jobs/_empty_state.html.haml @@ -1,7 +1,7 @@ - illustration = local_assigns.fetch(:illustration) - illustration_size = local_assigns.fetch(:illustration_size) - title = local_assigns.fetch(:title) -- content = local_assigns.fetch(:content) +- content = local_assigns.fetch(:content, nil) - action = local_assigns.fetch(:action, nil) .row.empty-state @@ -11,7 +11,8 @@ .col-xs-12 .text-content %h4.text-center= title - %p= content + - if content + %p= content - if action .text-center = action diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml index 8b05440fc78..1e6d6f67e66 100644 --- a/app/views/projects/jobs/show.html.haml +++ b/app/views/projects/jobs/show.html.haml @@ -93,14 +93,13 @@ illustration: 'illustrations/manual_action.svg', illustration_size: 'svg-394', title: _('This job requires a manual action'), - content: _('This job depends on a user to trigger its process. Often they are used to deploy code to production environments.'), - action: ( link_to _('Trigger this manual action'), play_project_job_path(@project, @build), class: 'btn btn-primary', title: _('Trigger this manual action') ) + content: _('This job depends on a user to trigger its process. Often they are used to deploy code to production environments'), + action: ( link_to _('Trigger this manual action'), play_project_job_path(@project, @build), method: :post, class: 'btn btn-primary', title: _('Trigger this manual action') ) - else = render 'empty_state', illustration: 'illustrations/job_not_triggered.svg', illustration_size: 'svg-306', - title: _('This job has not been triggered yet'), - content: _('This job depends on upstream jobs that need to succeed in order for this job to be triggered.') + title: _('This job has not been triggered yet') = render "sidebar" |