kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixed MR handling when GitLab CI project is not present

Browse source
This commit is contained in:
Kamil Trzcinski 2015-09-21 13:53:03 +02:00
parent 183892fde9
commit ca6fd0a27d
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/models/project_services/gitlab_ci_service.rb
View file

@ -46,7 +46,9 @@ 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)
Ci::CreateCommitService.new.execute(ci_project, data) if ci_project
Ci::CreateCommitService.new.execute(ci_project, data)
end
end end
def get_ci_commit(sha, ref) def get_ci_commit(sha, ref)
@ -85,7 +87,9 @@ class GitlabCiService < CiService
end end
def build_page(sha, ref) def build_page(sha, ref)
Ci::RoutesHelper.ci_project_ref_commits_path(project.gitlab_ci_project, ref, sha) if project.gitlab_ci_project.present?
Ci::RoutesHelper.ci_project_ref_commits_path(project.gitlab_ci_project, ref, sha)
end
end end
def title def title

3
app/views/projects/merge_requests/widget/_heading.html.haml
View file

@ -10,7 +10,8 @@
%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
= link_to "View build details", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink" - if ci_build_details_path(@merge_request)
= link_to "View build details", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
.ci_widget .ci_widget
= icon("spinner spin") = icon("spinner spin")