diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-03-28 13:51:30 +0200 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-03-28 13:51:30 +0200 |
| commit | c48f33c5bec02e8fd49326514023f6b6af66d693 (patch) | |
| tree | 548ca8cb4790bd2e4233d8f110f2fd23d713678f | |
| parent | 0969f198496c2ab0b4be6dcd0d9c6434f71e780d (diff) | |
| download | gitlab-ce-c48f33c5bec02e8fd49326514023f6b6af66d693.tar.gz | |
Move action link to build extended status illustration
| -rw-r--r-- | app/views/projects/jobs/_empty_states.html.haml | 2 | ||||
| -rw-r--r-- | lib/gitlab/ci/status/build/action.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/views/projects/jobs/_empty_states.html.haml b/app/views/projects/jobs/_empty_states.html.haml index 6d4a9931923..4d2c776e538 100644 --- a/app/views/projects/jobs/_empty_states.html.haml +++ b/app/views/projects/jobs/_empty_states.html.haml @@ -6,4 +6,4 @@ illustration_size: illustration[:size], title: illustration[:title], content: illustration[:content], - action: @build.playable? ? link_to(_("Trigger this manual action"), detailed_status.action_path, method: detailed_status.action_method, class: 'btn btn-primary', title: _("Trigger this manual action")) : nil + action: illustration[:action_path] ? link_to(_("Trigger this manual action"), illustration[:action_path], method: illustration[:action_method], class: 'btn btn-primary', title: _("Trigger this manual action")) : nil diff --git a/lib/gitlab/ci/status/build/action.rb b/lib/gitlab/ci/status/build/action.rb index 17eb37448cb..f7f3d47c098 100644 --- a/lib/gitlab/ci/status/build/action.rb +++ b/lib/gitlab/ci/status/build/action.rb @@ -20,6 +20,8 @@ module Gitlab 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_path: action_path, + action_method: action_method } end |