adjusted margins, and status ’success_with_warnings’ is changed to mo…

…re shorter name.

lib/hooks/gitlab/templates/pipeline.html.haml

@@ -1,36 +1,36 @@
 :ruby
+ status_name = -> (name) { name == 'success_with_warnings' ? 'success(warnings)' : name }
  label_classes = {
  'failed' => 'label-danger',
  'created' => 'label-info',
  'manual' => 'label-info',
  'running' => 'label-info',
  'success' => 'label-success',
- 'success_with_warnings' => 'label-warning'
+ 'success(warnings)' => 'label-warning'
  }
  web_url = payload.project.web_url
- p_status = payload.object_attributes.status
+ p_status = status_name[payload.object_attributes.status]
  p_label_class = label_classes[p_status].presence || 'label-default'
  p_id = payload.object_attributes.id
  p_url = "#{web_url}/pipelines/#{p_id}"
 
-%div.col-xs-12
- %span.col-xs-1.label{class: p_label_class}= p_status
- %span.col-xs-11
+%div.col-lg-12
+ %span.col-lg-2.label{class: p_label_class}= p_status
+ %span.col-lg-10
  %a{href: p_url} Pipeline ##{p_id}
  on 
  %a{href: web_url} #{payload.project.name}
 
-%div.col-xs-12
+%div.col-lg-12
  %details
  %summary
  Jobs
  %ul
  - payload.builds.each do |build|
- - status = build.status
+ - status = status_name[build.status]
  - label_class = label_classes[status].presence || 'label-default'
  - job_url = "#{web_url}/-/jobs/#{build.id}"
  %li
- %span.col-xs-1.label{class: label_class}
- #{status}
-  
- %a{href: job_url}= build.name
+ %span.col-lg-2.label{class: label_class}= status
+ %span.col-lg-10
+ %a{href: job_url}= build.name

spec/fixtures/payload/gitlab/pipeline.json

@@ -76,7 +76,7 @@
  "id": 377,
  "stage": "test",
  "name": "test-image",
- "status": "success",
+ "status": "success_with_warnings",
  "created_at": "2016-08-12 15:23:28 UTC",
  "started_at": "2016-08-12 15:26:12 UTC",
  "finished_at": null,

spec/gitlab_spec.rb

@@ -193,56 +193,61 @@
 
 
  it { expect(subject[:source]).to be_dom_equal <<~HTML }
- <div class='col-xs-12'>
- <span class='col-xs-1 label label-danger'>
+ <div class='col-lg-12'>
+ <span class='col-lg-2 label label-danger'>
  failed
  </span>
- <span class='col-xs-11'>
+ <span class='col-lg-10'>
  <a href='http://192.168.64.1:3005/gitlab-org/gitlab-test/pipelines/31'>Pipeline #31</a>
  on 
  <a href='http://192.168.64.1:3005/gitlab-org/gitlab-test'>Gitlab Test</a>
  </span>
  </div>
- <div class='col-xs-12'>
+ <div class='col-lg-12'>
  <details>
  <summary>
  Jobs
  </summary>
  <ul>
  <li>
- <span class='col-xs-1 label label-success'>
+ <span class='col-lg-2 label label-success'>
  success
  </span>
- &nbsp;
- <a href='http://192.168.64.1:3005/gitlab-org/gitlab-test/-/jobs/376'>build-image</a>
+ <span class='col-lg-10'>
+ <a href='http://192.168.64.1:3005/gitlab-org/gitlab-test/-/jobs/376'>build-image</a>
+ </span>
  </li>
  <li>
- <span class='col-xs-1 label label-success'>
- success
+ <span class='col-lg-2 label label-warning'>
+ success(warnings)
+ </span>
+ <span class='col-lg-10'>
+ <a href='http://192.168.64.1:3005/gitlab-org/gitlab-test/-/jobs/377'>test-image</a>
  </span>
- &nbsp;
- <a href='http://192.168.64.1:3005/gitlab-org/gitlab-test/-/jobs/377'>test-image</a>
  </li>
  <li>
- <span class='col-xs-1 label label-info'>
+ <span class='col-lg-2 label label-info'>
  created
  </span>
- &nbsp;
- <a href='http://192.168.64.1:3005/gitlab-org/gitlab-test/-/jobs/378'>test</a>
+ <span class='col-lg-10'>
+ <a href='http://192.168.64.1:3005/gitlab-org/gitlab-test/-/jobs/378'>test</a>
+ </span>
  </li>
  <li>
- <span class='col-xs-1 label label-danger'>
+ <span class='col-lg-2 label label-danger'> 
  failed
  </span>
- &nbsp;
- <a href='http://192.168.64.1:3005/gitlab-org/gitlab-test/-/jobs/379'>staging</a>
+ <span class='col-lg-10'>
+ <a href='http://192.168.64.1:3005/gitlab-org/gitlab-test/-/jobs/379'>staging</a>
+ </span>
  </li>
  <li>
- <span class='col-xs-1 label label-default'>
+ <span class='col-lg-2 label label-default'>
  skipped
  </span>
- &nbsp;
- <a href='http://192.168.64.1:3005/gitlab-org/gitlab-test/-/jobs/380'>production</a>
+ <span class='col-lg-10'>
+ <a href='http://192.168.64.1:3005/gitlab-org/gitlab-test/-/jobs/380'>production</a>
+ </span>
  </li>
  </ul>
  </details>