Add status badge for MR

Dmitriy Zaporozhets
1 parent ed92cfde
Showing 5 changed files with 20 additions and 0 deletions Show diff stats
app/assets/stylesheets/sections/merge_requests.scss
app/helpers/merge_requests_helper.rb
app/models/gitlab_ci_service.rb
app/models/project.rb
app/views/merge_requests/show/_mr_box.html.haml
@@ -138,3 +138,8 @@ li.merge_request {
   }
 }
+.status-badge {
+  height: 32px;
+  width: 100%;
+  @include border-radius(5px);
+}
@@ -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
@@ -32,4 +32,8 @@ class GitlabCiService &lt; Service
     hook.url = [project_url, "/build", "?token=#{token}"].join("")
     hook.save
   end
+
+  def commit_badge_path sha
+    project_url + "/status?sha=#{sha}"
+  end
 end
@@ -188,4 +188,8 @@ class Project &lt; ActiveRecord::Base
   def services
     [gitlab_ci_service].compact
   end
+
+  def gitlab_ci?
+    gitlab_ci_service && gitlab_ci_service.active
+  end
 end
@@ -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
	@@ -138,3 +138,8 @@ li.merge_request {		@@ -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	+}
	@@ -38,4 +38,8 @@ module MergeRequestsHelper		@@ -38,4 +38,8 @@ module MergeRequestsHelper
38	classes << " merged" if mr.merged?	38	classes << " merged" if mr.merged?
39	classes	39	classes
40	end	40	end
		41	+
		42	+ def ci_status_path
		43	+ @project.gitlab_ci_service.commit_badge_path(@merge_request.last_commit.sha)
		44	+ end
41	end	45	end
	@@ -32,4 +32,8 @@ class GitlabCiService < Service		@@ -32,4 +32,8 @@ class GitlabCiService < Service
32	hook.url = [project_url, "/build", "?token=#{token}"].join("")	32	hook.url = [project_url, "/build", "?token=#{token}"].join("")
33	hook.save	33	hook.save
34	end	34	end
		35	+
		36	+ def commit_badge_path sha
		37	+ project_url + "/status?sha=#{sha}"
		38	+ end
35	end	39	end
	@@ -188,4 +188,8 @@ class Project < ActiveRecord::Base		@@ -188,4 +188,8 @@ class Project < ActiveRecord::Base
188	def services	188	def services
189	[gitlab_ci_service].compact	189	[gitlab_ci_service].compact
190	end	190	end
		191	+
		192	+ def gitlab_ci?
		193	+ gitlab_ci_service && gitlab_ci_service.active
		194	+ end
191	end	195	end