diff options
| author | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-08-04 11:29:41 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-08-11 21:29:58 +0200 |
| commit | 03ea01946524a74773b24430c81804c2724b84b6 (patch) | |
| tree | adbed05098ed4c0cb0e70542e04d07c541040bdd /app/views/projects/merge_requests/widget/_heading.html.haml | |
| parent | b497b0ce3fc3c1882639f9c7d55f7991ce41f15d (diff) | |
| download | gitlab-ce-03ea01946524a74773b24430c81804c2724b84b6.tar.gz | |
CI build status not per environment
Diffstat (limited to 'app/views/projects/merge_requests/widget/_heading.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/widget/_heading.html.haml | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml index 9590c1dbbd1..16e923b831c 100644 --- a/app/views/projects/merge_requests/widget/_heading.html.haml +++ b/app/views/projects/merge_requests/widget/_heading.html.haml @@ -1,18 +1,17 @@ - if @pipeline .mr-widget-heading - - @merge_request.environments.each do |environments| - - %w[success success_with_warnings skipped canceled failed running pending].each do |status| - .ci_widget{ class: "ci-#{status}", style: ("display:none" unless @pipeline.status == status) } - = ci_icon_for_status(status) - %span - CI build - = ci_label_for_status(status) - for - - commit = @merge_request.diff_head_commit - = succeed "." do - = link_to @pipeline.short_sha, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, @pipeline.sha), class: "monospace" - %span.ci-coverage - = link_to "View details", builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "js-show-tab", data: {action: 'builds'} + - %w[success success_with_warnings skipped canceled failed running pending].each do |status| + .ci_widget{ class: "ci-#{status}", style: ("display:none" unless @pipeline.status == status) } + = ci_icon_for_status(status) + %span + CI build + = ci_label_for_status(status) + for + - commit = @merge_request.diff_head_commit + = succeed "." do + = link_to @pipeline.short_sha, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, @pipeline.sha), class: "monospace" + %span.ci-coverage + = link_to "View details", builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "js-show-tab", data: {action: 'builds'} - elsif @merge_request.has_ci? - # Compatibility with old CI integrations (ex jenkins) when you request status from CI server via AJAX @@ -48,9 +47,8 @@ .mr-widget-heading .ci_widget{ class: "ci-success" } = ci_icon_for_status("success") - %span - Released to #{environment.name} - = succeed '.' do - = time_ago_with_tooltip(environment.created_at, placement: 'bottom') - - if environment.external_url - = link_to icon('external-link'), environment.external_url + %span.hidden-sm + Released to #{environment.name}. + - external_url = environment.external_url + - if external_url + = link_to icon('external-link', text: "View on #{external_url.gsub(/\A.*?:\/\//, '')}"), external_url |