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
Tatuya Kamada
gitlab-ce
Commits
c4eacbd2
Commit
c4eacbd2
authored
Dec 22, 2015
by
Robert Speicher
Committed by
Robert Speicher
Dec 21, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'fix-mr-500' into 'master'
Fix MR 500 when viewing the MR page Fixes #2712 See merge request !2167
parent
9e5ed7ef
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
2 deletions
+38
-2
CHANGELOG
CHANGELOG
+2
-0
app/helpers/merge_requests_helper.rb
app/helpers/merge_requests_helper.rb
+10
-1
app/models/project_services/gitlab_ci_service.rb
app/models/project_services/gitlab_ci_service.rb
+6
-1
spec/helpers/merge_requests_helper_spec.rb
spec/helpers/merge_requests_helper_spec.rb
+20
-0
No files found.
CHANGELOG
View file @
c4eacbd2
...
...
@@ -8,6 +8,8 @@ v 8.3.0 (unreleased)
- Add button to automatically merge a merge request when the build succeeds (Zeger-Jan van de Weg)
- Provide better diagnostic message upon project creation errors (Stan Hu)
- Bump devise to 3.5.3 to fix reset token expiring after account creation (Stan Hu)
- Remove api credentials from link to build_page
- Deprecate GitLabCiService making it to always be inactive
- Bump gollum-lib to 4.1.0 (Stan Hu)
- Fix broken group avatar upload under "New group" (Stan Hu)
- Update project repositorize size and commit count during import:repos task (Stan Hu)
...
...
app/helpers/merge_requests_helper.rb
View file @
c4eacbd2
...
...
@@ -27,7 +27,16 @@ module MergeRequestsHelper
end
def
ci_build_details_path
(
merge_request
)
merge_request
.
source_project
.
ci_service
.
build_page
(
merge_request
.
last_commit
.
sha
,
merge_request
.
source_branch
)
build_url
=
merge_request
.
source_project
.
ci_service
.
build_page
(
merge_request
.
last_commit
.
sha
,
merge_request
.
source_branch
)
return
nil
unless
build_url
parsed_url
=
URI
.
parse
(
build_url
)
unless
parsed_url
.
userinfo
.
blank?
parsed_url
.
userinfo
=
''
end
parsed_url
.
to_s
end
def
merge_path_description
(
merge_request
,
separator
)
...
...
app/models/project_services/gitlab_ci_service.rb
View file @
c4eacbd2
...
...
@@ -18,6 +18,11 @@
# note_events :boolean default(TRUE), not null
#
# TODO(ayufan): The GitLabCiService is deprecated and the type should be removed when the database entries are removed
class
GitlabCiService
<
CiService
# this is no longer used
# We override the active accessor to always make GitLabCiService disabled
# Otherwise the GitLabCiService can be picked, but should never be since it's deprecated
def
active
false
end
end
spec/helpers/merge_requests_helper_spec.rb
View file @
c4eacbd2
require
'spec_helper'
describe
MergeRequestsHelper
do
describe
'ci_build_details_path'
do
let
(
:project
)
{
create
:project
}
let
(
:merge_request
)
{
MergeRequest
.
new
}
let
(
:ci_service
)
{
CiService
.
new
}
let
(
:last_commit
)
{
Ci
::
Commit
.
new
({})
}
before
do
allow
(
merge_request
).
to
receive
(
:source_project
).
and_return
(
project
)
allow
(
merge_request
).
to
receive
(
:last_commit
).
and_return
(
last_commit
)
allow
(
project
).
to
receive
(
:ci_service
).
and_return
(
ci_service
)
allow
(
last_commit
).
to
receive
(
:sha
).
and_return
(
'12d65c'
)
end
it
'does not include api credentials in a link'
do
allow
(
ci_service
).
to
receive
(
:build_page
).
and_return
(
"http://secretuser:secretpass@jenkins.example.com:8888/job/test1/scm/bySHA1/12d65c"
)
expect
(
helper
.
ci_build_details_path
(
merge_request
)).
to_not
match
(
"secret"
)
end
end
describe
'#issues_sentence'
do
subject
{
issues_sentence
(
issues
)
}
let
(
:issues
)
do
...
...
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