Skip to content
Snippets Groups Projects
Commit 6d607627 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge branch 'gitlab-ci-parallel' into 'master'

Update GitLab CI service to work with new GitLab CI

See merge request !1239
parents c3e83d47 4a41d4b7
Branches
Tags
No related merge requests found
Loading
Loading
@@ -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)
Loading
Loading
@@ -55,7 +55,7 @@ class GitlabCiService < CiService
end
 
def build_page(sha)
project_url + "/builds/#{sha}"
project_url + "/commits/#{sha}"
end
 
def builds_path
Loading
Loading
Loading
Loading
@@ -34,11 +34,11 @@ describe GitlabCiService do
end
 
describe :commit_status_path do
it { @service.commit_status_path("2ab7834c").should == "http://ci.gitlab.org/projects/2/builds/2ab7834c/status.json?token=verySecret"}
it { @service.commit_status_path("2ab7834c").should == "http://ci.gitlab.org/projects/2/commits/2ab7834c/status.json?token=verySecret"}
end
 
describe :build_page do
it { @service.build_page("2ab7834c").should == "http://ci.gitlab.org/projects/2/builds/2ab7834c"}
it { @service.build_page("2ab7834c").should == "http://ci.gitlab.org/projects/2/commits/2ab7834c"}
end
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment