Commit 3abcab77 authored by Kamil Trzcinski's avatar Kamil Trzcinski

Fixed MR handling when GitLab CI project is not present

parent 183892fd
...@@ -46,8 +46,10 @@ class GitlabCiService < CiService ...@@ -46,8 +46,10 @@ class GitlabCiService < CiService
end end
ci_project = Ci::Project.find_by(gitlab_id: project.id) ci_project = Ci::Project.find_by(gitlab_id: project.id)
if ci_project
Ci::CreateCommitService.new.execute(ci_project, data) Ci::CreateCommitService.new.execute(ci_project, data)
end end
end
def get_ci_commit(sha, ref) def get_ci_commit(sha, ref)
Ci::Project.find(project.gitlab_ci_project).commits.find_by_sha_and_ref!(sha, ref) Ci::Project.find(project.gitlab_ci_project).commits.find_by_sha_and_ref!(sha, ref)
...@@ -85,8 +87,10 @@ class GitlabCiService < CiService ...@@ -85,8 +87,10 @@ class GitlabCiService < CiService
end end
def build_page(sha, ref) def build_page(sha, ref)
if project.gitlab_ci_project.present?
Ci::RoutesHelper.ci_project_ref_commits_path(project.gitlab_ci_project, ref, sha) Ci::RoutesHelper.ci_project_ref_commits_path(project.gitlab_ci_project, ref, sha)
end end
end
def title def title
'GitLab CI' 'GitLab CI'
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
%span CI build #{status} %span CI build #{status}
for #{@merge_request.last_commit_short_sha}. for #{@merge_request.last_commit_short_sha}.
%span.ci-coverage %span.ci-coverage
- if ci_build_details_path(@merge_request)
= link_to "View build details", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink" = link_to "View build details", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
.ci_widget .ci_widget
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment