diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-05 15:22:01 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-06 14:42:31 +0300 |
| commit | 7ef05ad0e8df747b2a5af1205951270ca10a08e2 (patch) | |
| tree | 035f3d9b922d4d286fb314496be92f8216508925 | |
| parent | 8ef84b3e5c957cec1cf0ea083c0920294daa42d4 (diff) | |
| download | gitlab-ce-7ef05ad0e8df747b2a5af1205951270ca10a08e2.tar.gz | |
Merge branch 'fix_ci_services' into 'master'
Fix CI links on MR page
Fixes gitlab-org/gitlab-ci#145
See merge request !609
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | app/models/project_services/gitlab_ci_service.rb | 4 | ||||
| -rw-r--r-- | spec/models/project_services/gitlab_ci_service_spec.rb | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 2c4af5362de..94deedf952c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -27,6 +27,9 @@ v 7.10.0 (unreleased) - Improve UI for mobile phones on dashboard and project pages - Add room notification and message color option for HipChat +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. diff --git a/app/models/project_services/gitlab_ci_service.rb b/app/models/project_services/gitlab_ci_service.rb index 0f9838a575d..f6f75cae8e7 100644 --- a/app/models/project_services/gitlab_ci_service.rb +++ b/app/models/project_services/gitlab_ci_service.rb @@ -43,7 +43,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) @@ -90,7 +90,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 diff --git a/spec/models/project_services/gitlab_ci_service_spec.rb b/spec/models/project_services/gitlab_ci_service_spec.rb index 6a557d839ca..d3bbd6174ec 100644 --- a/spec/models/project_services/gitlab_ci_service_spec.rb +++ b/spec/models/project_services/gitlab_ci_service_spec.rb @@ -40,10 +40,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 |