summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2014-11-05 17:42:52 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2014-11-05 17:42:52 +0000
commit6d60762793f79bfb07cc15e78ef6cc53dca6be48 (patch)
tree164c02397e1f8e99e782c1dc0322896275a6e5c0 /app
parentc3e83d4771071b1e63ebcc88be624296ce72499a (diff)
parent4a41d4b7d246c4e5f9a9062c7dd417510b0bae0c (diff)
downloadgitlab-ce-6d60762793f79bfb07cc15e78ef6cc53dca6be48.tar.gz
Merge branch 'gitlab-ci-parallel' into 'master'
Update GitLab CI service to work with new GitLab CI See merge request !1239
Diffstat (limited to 'app')
-rw-r--r--app/models/project_services/gitlab_ci_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project_services/gitlab_ci_service.rb b/app/models/project_services/gitlab_ci_service.rb
index a897c4ab76b..fadebf968bc 100644
--- a/app/models/project_services/gitlab_ci_service.rb
+++ b/app/models/project_services/gitlab_ci_service.rb
@@ -28,7 +28,7 @@ class GitlabCiService < CiService
end
def commit_status_path(sha)
- project_url + "/builds/#{sha}/status.json?token=#{token}"
+ project_url + "/commits/#{sha}/status.json?token=#{token}"
end
def get_ci_build(sha)
@@ -55,7 +55,7 @@ class GitlabCiService < CiService
end
def build_page(sha)
- project_url + "/builds/#{sha}"
+ project_url + "/commits/#{sha}"
end
def builds_path