From f898e52a00741c620733853bb834d89695ce50ec Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Tue, 22 Dec 2015 00:20:32 +0100 Subject: ci_build_details_path should return nil if builds_page result is nil This is required since we parse URI later and remove the credentials --- app/helpers/merge_requests_helper.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 9a9eaa05c6d..1dd07a2a220 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -28,6 +28,8 @@ module MergeRequestsHelper def ci_build_details_path(merge_request) 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? -- cgit v1.2.1