Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
2144cc71
Commit
2144cc71
authored
May 05, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix gitlab CI links
parent
1132084d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
CHANGELOG
CHANGELOG
+3
-0
app/models/project_services/gitlab_ci_service.rb
app/models/project_services/gitlab_ci_service.rb
+2
-2
spec/models/project_services/gitlab_ci_service_spec.rb
spec/models/project_services/gitlab_ci_service_spec.rb
+2
-0
No files found.
CHANGELOG
View file @
2144cc71
...
@@ -45,6 +45,9 @@ v 7.11.0 (unreleased)
...
@@ -45,6 +45,9 @@ v 7.11.0 (unreleased)
- Add footnotes support to Markdown (Guillaume Delbergue)
- Add footnotes support to Markdown (Guillaume Delbergue)
- Add current_sign_in_at to UserFull REST api.
- Add current_sign_in_at to UserFull REST api.
v 7.10.2
- Fix CI links on MR page
v 7.10.0
v 7.10.0
- Ignore submodules that are defined in .gitmodules but are checked in as directories.
- Ignore submodules that are defined in .gitmodules but are checked in as directories.
- Allow projects to be imported from Google Code.
- Allow projects to be imported from Google Code.
...
...
app/models/project_services/gitlab_ci_service.rb
View file @
2144cc71
...
@@ -44,7 +44,7 @@ class GitlabCiService < CiService
...
@@ -44,7 +44,7 @@ class GitlabCiService < CiService
end
end
def
commit_status_path
(
sha
,
ref
)
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
end
def
get_ci_build
(
sha
,
ref
)
def
get_ci_build
(
sha
,
ref
)
...
@@ -91,7 +91,7 @@ class GitlabCiService < CiService
...
@@ -91,7 +91,7 @@ class GitlabCiService < CiService
end
end
def
build_page
(
sha
,
ref
)
def
build_page
(
sha
,
ref
)
project_url
+
"/refs/
#{
ref
}
/commits/
#{
sha
}
"
URI
::
encode
(
project_url
+
"/refs/
#{
ref
}
/commits/
#{
sha
}
"
)
end
end
def
builds_path
def
builds_path
...
...
spec/models/project_services/gitlab_ci_service_spec.rb
View file @
2144cc71
...
@@ -41,10 +41,12 @@ describe GitlabCiService do
...
@@ -41,10 +41,12 @@ describe GitlabCiService do
describe
:commit_status_path
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
(
"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
end
describe
:build_page
do
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
(
"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
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment