summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-07-27 16:39:53 -0500
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-07-27 16:39:53 -0500
commit3ceb1ed39ebf499dc5fe51c2504271261eed5457 (patch)
treeb0c43c3180497576c0cebf05ae4e0b928318c659
parentf6063baed4e19eed2c1dd7549ede0692f3250df8 (diff)
downloadgitlab-ce-UX-DEMO-deployment-status.tar.gz
DO NOT MERGE- hard-coded deploy messagesUX-DEMO-deployment-status
-rw-r--r--app/views/projects/merge_requests/widget/_heading.html.haml68
1 files changed, 26 insertions, 42 deletions
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml
index 6ef640bb654..1cd82a885db 100644
--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
@@ -1,44 +1,28 @@
-- if @pipeline
- .mr-widget-heading
- - %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
- - # Remove in later versions when services like Jenkins will set CI status via Commit status API
- .mr-widget-heading
- - %w[success skipped canceled failed running pending].each do |status|
- .ci_widget{class: "ci-#{status}", style: "display:none"}
- = ci_icon_for_status(status)
- %span
- CI build
- = ci_label_for_status(status)
- for
- - commit = @merge_request.diff_head_commit
- = succeed "." do
- = link_to commit.short_id, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, commit), class: "monospace"
- %span.ci-coverage
- - if details_path = ci_build_details_path(@merge_request)
- = link_to "View details", details_path, :"data-no-turbolink" => "data-no-turbolink"
+.mr-widget-heading
+ - %w[success].each do |status|
+ .ci_widget{ class: "ci-success" }
+ = ci_icon_for_status("success")
+ %span
+ CI build
+ = ci_label_for_status("success")
+ for
+ = link_to 'c224e0a0.', "https://gitlab.com/gitlab-examples/velociraptor/merge_requests", class: "monospace"
+ = link_to "View details", builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "js-show-tab", data: {action: 'builds'}
+ .ci_widget{ class: "ci-success" }
+ = ci_icon_for_status("success")
+ Deployed to
+ = link_to 'Staging', "http://velociraptor-staging.gitlap.com/", class: "monospace", target: "_blank"
+ %span 20 minutes ago.
+ = link_to "http://velociraptor-staging.gitlap.com", target: "_blank" do
+ %span View dev.gitlab.com
+ = icon('external-link fw')
- .ci_widget
- = icon("spinner spin")
- Checking CI status for #{@merge_request.diff_head_commit.short_id}&hellip;
-
- .ci_widget.ci-not_found{style: "display:none"}
- = icon("times-circle")
- Could not find CI status for #{@merge_request.diff_head_commit.short_id}.
-
- .ci_widget.ci-error{style: "display:none"}
- = icon("times-circle")
- Could not connect to the CI server. Please check your settings and try again.
+ .ci_widget{ class: "ci-success" }
+ = ci_icon_for_status("success")
+ Deployed to
+ = link_to 'Production', "http://velociraptor-staging.gitlap.com/", class: "monospace", target: "_blank"
+ %span about 5 minutes ago.
+ = link_to "http://velociraptor.gitlap.com/", target: "_blank" do
+ %span View gitlab.com
+ = icon('external-link fw')