diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-09-21 01:45:39 +0100 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-10 10:48:50 -0500 |
| commit | eb55ac7d4d13a2c404d24c68cef10675ce29cf3c (patch) | |
| tree | db5efe142b4563587e04191f93ae5b80c774417f /app/views | |
| parent | 65e482e7e9b7385e6d8ee72c102eca6e79ee97fa (diff) | |
| download | gitlab-ce-eb55ac7d4d13a2c404d24c68cef10675ce29cf3c.tar.gz | |
Added final changes from handover
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/commit/_pipeline_stage.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/commit/_pipeline_status_group.html.haml | 17 |
2 files changed, 9 insertions, 10 deletions
diff --git a/app/views/projects/commit/_pipeline_stage.html.haml b/app/views/projects/commit/_pipeline_stage.html.haml index 23c5c51fbc2..68d42126bf6 100644 --- a/app/views/projects/commit/_pipeline_stage.html.haml +++ b/app/views/projects/commit/_pipeline_stage.html.haml @@ -10,5 +10,5 @@ - else %li.build .curve - .build-content + .dropdown.inline.build-content{ type: 'button', data: { toggle: 'dropdown' } } = render "projects/commit/pipeline_status_group", name: group_name, subject: grouped_statuses diff --git a/app/views/projects/commit/_pipeline_status_group.html.haml b/app/views/projects/commit/_pipeline_status_group.html.haml index 2064242ab54..bff65bff653 100644 --- a/app/views/projects/commit/_pipeline_status_group.html.haml +++ b/app/views/projects/commit/_pipeline_status_group.html.haml @@ -1,12 +1,11 @@ - group_status = CommitStatus.where(id: subject).status %span.ci-status-icon = render_status_with_link('build', group_status) -.dropdown.inline - %button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown' } } - %span.ci-status-text - = name - %span.badge= subject.size - %ul.dropdown-menu.grouped-pipeline-dropdown - .arrow - - subject.each do |status| - = render "projects/#{status.to_partial_path}_pipeline", subject: status +%button.dropdown-menu-toggle + %span.ci-status-text + = name + %span.badge= subject.size +%ul.dropdown-menu.grouped-pipeline-dropdown + .arrow + - subject.each do |status| + = render "projects/#{status.to_partial_path}_pipeline", subject: status |