diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-12-14 20:42:42 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-12-14 20:42:42 +0800 |
| commit | 3ce6ba7db9bcdeb9a642e7020fb736ebe54f88aa (patch) | |
| tree | cdfdeffb93abcf24a1eacb4d1e382e30838cb9d2 /app/views/projects/ci/pipelines/_pipeline.html.haml | |
| parent | 367024f1707ebbf986e5f25ac208f24e35746389 (diff) | |
| parent | 3e90aa1119fc4c77e92e6492f1906f252d90b64e (diff) | |
| download | gitlab-ce-3ce6ba7db9bcdeb9a642e7020fb736ebe54f88aa.tar.gz | |
Merge remote-tracking branch 'upstream/master' into show-commit-status-from-latest-pipeline
* upstream/master: (39 commits)
Improve build status specs contexts descriptions
Add some missing tests for detailed status methods
Remove trailing blank line from Allowable module
Update manual build icon SVG
Make it possible to mix `Gitlab::Routing` in
Extract abilities checking module from ability model
Extend tests for pipeline detailed status helpers
Add tests for common build detailed status helpers
Add missing tests for build `cancelable?` method
Add tests for detailed build statuses factory
Make it possible to retry build that was canceled
Make build retryable only if complete and executed
Improve readability in methods for detailed status
Add tests for build cancelable/retryable statuses
Extend specs for build play/stop detailed statuses
Refine build stop/play extended status specs
Use manual build icon in play/stop build statuses
Adds manual action icon and case to show it
Fix detailed status specs for pipeline stage model
Fix detailed status badge for generic commit status
...
Diffstat (limited to 'app/views/projects/ci/pipelines/_pipeline.html.haml')
| -rw-r--r-- | app/views/projects/ci/pipelines/_pipeline.html.haml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index b58dceb58c9..3f05a21990f 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -1,13 +1,10 @@ - status = pipeline.status -- detailed_status = pipeline.detailed_status - show_commit = local_assigns.fetch(:show_commit, true) - show_branch = local_assigns.fetch(:show_branch, true) %tr.commit %td.commit-link - = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id), class: "ci-status ci-#{detailed_status}" do - = ci_icon_for_status(detailed_status) - = ci_text_for_status(detailed_status) + = render 'ci/status/badge', status: pipeline.detailed_status(current_user) %td = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do |