diff options
| author | Marvin Frick <marvin.frick@sinnerschrader.com> | 2014-06-10 21:21:28 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-12-22 00:28:19 +0100 |
| commit | 0d05400bdee182de0564e4b0ac85f9365aa76adb (patch) | |
| tree | f9705b319f0fd5e31daec2b6a42f19d978c1f0c3 /app/helpers/merge_requests_helper.rb | |
| parent | 4156a37aecb83155752d84f44f800dcffb61741e (diff) | |
| download | gitlab-ce-0d05400bdee182de0564e4b0ac85f9365aa76adb.tar.gz | |
removes api credentials from link to build_page
Also adds a spec for MergeRequestHelper to avoid having a regression
later on.
Diffstat (limited to 'app/helpers/merge_requests_helper.rb')
| -rw-r--r-- | app/helpers/merge_requests_helper.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 6c32647594d..9a9eaa05c6d 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -27,7 +27,14 @@ 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) + 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) |