Download as
Browse Code »

Commit ebcbe0c87b12d10c40c6a3fa13ceec02e8220090

Authored by Dmitriy Zaporozhets
1 parent ed92cfde
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Add status badge for MR

Showing 5 changed files with 20 additions and 0 deletions   Show diff stats
app/assets/stylesheets/sections/merge_requests.scss
  Diff comments   View file @ebcbe0c
... ... @@ -138,3 +138,8 @@ li.merge_request {
138 138 }
139 139 }
140 140  
  141 +.status-badge {
  142 + height: 32px;
  143 + width: 100%;
  144 + @include border-radius(5px);
  145 +}
... ...
app/helpers/merge_requests_helper.rb
  Diff comments   View file @ebcbe0c
... ... @@ -38,4 +38,8 @@ module MergeRequestsHelper
38 38 classes << " merged" if mr.merged?
39 39 classes
40 40 end
  41 +
  42 + def ci_status_path
  43 + @project.gitlab_ci_service.commit_badge_path(@merge_request.last_commit.sha)
  44 + end
41 45 end
... ...
app/models/gitlab_ci_service.rb
  Diff comments   View file @ebcbe0c
... ... @@ -32,4 +32,8 @@ class GitlabCiService &lt; Service
32 32 hook.url = [project_url, "/build", "?token=#{token}"].join("")
33 33 hook.save
34 34 end
  35 +
  36 + def commit_badge_path sha
  37 + project_url + "/status?sha=#{sha}"
  38 + end
35 39 end
... ...
app/models/project.rb
  Diff comments   View file @ebcbe0c
... ... @@ -188,4 +188,8 @@ class Project &lt; ActiveRecord::Base
188 188 def services
189 189 [gitlab_ci_service].compact
190 190 end
  191 +
  192 + def gitlab_ci?
  193 + gitlab_ci_service && gitlab_ci_service.active
  194 + end
191 195 end
... ...
app/views/merge_requests/show/_mr_box.html.haml
  Diff comments   View file @ebcbe0c
... ... @@ -6,6 +6,9 @@
6 6 - else
7 7 .alert-message.success.status_info Open
8 8 = gfm escape_once(@merge_request.title)
  9 + - if @project.gitlab_ci?
  10 + .right
  11 + = image_tag ci_status_path, class: 'status-badge'
9 12  
10 13 .middle_box_content
11 14 %div
... ...