diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-11-20 20:34:05 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-11-20 20:34:05 +0300 |
| commit | ebcbe0c87b12d10c40c6a3fa13ceec02e8220090 (patch) | |
| tree | a0e989f66d0f5420e817600a7791c57458a69e24 | |
| parent | ed92cfdebd99680048b1a4b697cb338bb93b4170 (diff) | |
| download | gitlab-ce-ebcbe0c87b12d10c40c6a3fa13ceec02e8220090.tar.gz | |
Add status badge for MR
| -rw-r--r-- | app/assets/stylesheets/sections/merge_requests.scss | 5 | ||||
| -rw-r--r-- | app/helpers/merge_requests_helper.rb | 4 | ||||
| -rw-r--r-- | app/models/gitlab_ci_service.rb | 4 | ||||
| -rw-r--r-- | app/models/project.rb | 4 | ||||
| -rw-r--r-- | app/views/merge_requests/show/_mr_box.html.haml | 3 |
5 files changed, 20 insertions, 0 deletions
diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss index 78e3fa397cb..9087e7c2f59 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 16855989bdd..b23c4a8f0df 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 0bce425fdab..24b70323098 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 d313c778e6d..3cbc9417b8f 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 26636435a06..b4b4be2980a 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 |