Merge branch 'fix_ci_services' into 'master'
Fix CI links on MR page Fixes gitlab-org/gitlab-ci#145 See merge request !609
This commit is contained in:
commit
5bff135fb3
|
@ -45,6 +45,9 @@ v 7.11.0 (unreleased)
|
|||
- Add footnotes support to Markdown (Guillaume Delbergue)
|
||||
- Add current_sign_in_at to UserFull REST api.
|
||||
|
||||
v 7.10.2
|
||||
- Fix CI links on MR page
|
||||
|
||||
v 7.10.0
|
||||
- Ignore submodules that are defined in .gitmodules but are checked in as directories.
|
||||
- Allow projects to be imported from Google Code.
|
||||
|
|
|
@ -44,7 +44,7 @@ class GitlabCiService < CiService
|
|||
end
|
||||
|
||||
def commit_status_path(sha, ref)
|
||||
project_url + "/refs/#{ref}/commits/#{sha}/status.json?token=#{token}"
|
||||
URI::encode(project_url + "/refs/#{ref}/commits/#{sha}/status.json?token=#{token}")
|
||||
end
|
||||
|
||||
def get_ci_build(sha, ref)
|
||||
|
@ -91,7 +91,7 @@ class GitlabCiService < CiService
|
|||
end
|
||||
|
||||
def build_page(sha, ref)
|
||||
project_url + "/refs/#{ref}/commits/#{sha}"
|
||||
URI::encode(project_url + "/refs/#{ref}/commits/#{sha}")
|
||||
end
|
||||
|
||||
def builds_path
|
||||
|
|
|
@ -41,10 +41,12 @@ describe GitlabCiService do
|
|||
|
||||
describe :commit_status_path do
|
||||
it { expect(@service.commit_status_path("2ab7834c", 'master')).to eq("http://ci.gitlab.org/projects/2/refs/master/commits/2ab7834c/status.json?token=verySecret")}
|
||||
it { expect(@service.commit_status_path("issue#2", 'master')).to eq("http://ci.gitlab.org/projects/2/refs/master/commits/issue%232/status.json?token=verySecret")}
|
||||
end
|
||||
|
||||
describe :build_page do
|
||||
it { expect(@service.build_page("2ab7834c", 'master')).to eq("http://ci.gitlab.org/projects/2/refs/master/commits/2ab7834c")}
|
||||
it { expect(@service.build_page("issue#2", 'master')).to eq("http://ci.gitlab.org/projects/2/refs/master/commits/issue%232")}
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue