summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2014-10-02 16:25:19 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2014-10-02 16:25:19 +0000
commit4e96c84e587c0dc70225127e03bc531949f5dd88 (patch)
treeb506fa0121d1c98f632b8cd85f49ec09ffbf9316 /app/models
parent1a09a805ea9c7c534bc868dfa5881b57566d508c (diff)
parent8e33f9460c6f98df089eb367b96d9a1fc91c5d52 (diff)
downloadgitlab-ce-4e96c84e587c0dc70225127e03bc531949f5dd88.tar.gz
Merge branch 'show-build-coverage-in-mr' into 'master'
Show build coverage in MR ![Screenshot 2014-10-02 18.20.53](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/a8ff7b23bd/Screenshot_2014-10-02_18.20.53.png) See merge request !1148
Diffstat (limited to 'app/models')
-rw-r--r--app/models/project_services/gitlab_ci_service.rb17
1 files changed, 15 insertions, 2 deletions
diff --git a/app/models/project_services/gitlab_ci_service.rb b/app/models/project_services/gitlab_ci_service.rb
index 0f327e75289..4a19ca2f655 100644
--- a/app/models/project_services/gitlab_ci_service.rb
+++ b/app/models/project_services/gitlab_ci_service.rb
@@ -31,8 +31,13 @@ class GitlabCiService < CiService
project_url + "/builds/#{sha}/status.json?token=#{token}"
end
- def commit_status sha
- response = HTTParty.get(commit_status_path(sha), verify: false)
+ def get_ci_build(sha)
+ @ci_builds ||= {}
+ @ci_builds[sha] ||= HTTParty.get(commit_status_path(sha), verify: false)
+ end
+
+ def commit_status(sha)
+ response = get_ci_build(sha)
if response.code == 200 and response["status"]
response["status"]
@@ -41,6 +46,14 @@ class GitlabCiService < CiService
end
end
+ def commit_coverage(sha)
+ response = get_ci_build(sha)
+
+ if response.code == 200 and response["coverage"]
+ response["coverage"]
+ end
+ end
+
def build_page sha
project_url + "/builds/#{sha}"
end