diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss index 78e3fa397cbc2ac4ad6c04f898c186251a355256..9087e7c2f59d9bf5b4e53ae5cacf378bdd71873a 100644 --- a/app/assets/stylesheets/sections/merge_requests.scss +++ b/app/assets/stylesheets/sections/merge_requests.scss @@ -138,3 +138,8 @@ li.merge_request { } } +.status-badge { + height: 32px; + width: 100%; + @include border-radius(5px); +} diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 16855989bdd98900273b55db7e0e2731258b4538..b23c4a8f0df1bd143bd5a1bbea4a1bdc637864c6 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -38,4 +38,8 @@ module MergeRequestsHelper classes << " merged" if mr.merged? classes end + + def ci_status_path + @project.gitlab_ci_service.commit_badge_path(@merge_request.last_commit.sha) + end end diff --git a/app/models/gitlab_ci_service.rb b/app/models/gitlab_ci_service.rb index 0bce425fdab78c7a6fdd2e4518f673c7286eee0c..24b70323098d64378135da9d8501830439f25cd3 100644 --- a/app/models/gitlab_ci_service.rb +++ b/app/models/gitlab_ci_service.rb @@ -32,4 +32,8 @@ class GitlabCiService < Service hook.url = [project_url, "/build", "?token=#{token}"].join("") hook.save end + + def commit_badge_path sha + project_url + "/status?sha=#{sha}" + end end diff --git a/app/models/project.rb b/app/models/project.rb index d313c778e6d502fbc3efd2b9256cc56241ed949d..3cbc9417b8f0ac9a01709e8ff496c73c0e20b7ec 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -188,4 +188,8 @@ class Project < ActiveRecord::Base def services [gitlab_ci_service].compact end + + def gitlab_ci? + gitlab_ci_service && gitlab_ci_service.active + end end diff --git a/app/views/merge_requests/show/_mr_box.html.haml b/app/views/merge_requests/show/_mr_box.html.haml index 26636435a0603dcdfbcb36f34f4f4ab5d323f1d1..b4b4be2980ab4f8bc26e5cb9d1991506d2a6e3fc 100644 --- a/app/views/merge_requests/show/_mr_box.html.haml +++ b/app/views/merge_requests/show/_mr_box.html.haml @@ -6,6 +6,9 @@ - else .alert-message.success.status_info Open = gfm escape_once(@merge_request.title) + - if @project.gitlab_ci? + .right + = image_tag ci_status_path, class: 'status-badge' .middle_box_content %div