Skip to content

Fix pipeline failures

张泽华请求将fix-pipeline-failures-220518合并到main-jh

What does this MR do and why?

  1. blame_pagination 找不到而引发的测试失败, 由于我们添加了jh/app/views/projects/blame/show.html.haml 来覆盖原来的模板, 并在此模板中render 了ee的app/views/projects/blame/show.html.haml, 由于上游更新了这个页面，在controller 里render show页面的时候添加了 blame_pagination 这个值到模板的 locals 中，而我们在render ee的页面的时候没有传入这个值，导致这个值找不到引发了报错。 因为原本的 render_ee 方法有缺陷，无法在render后在render的模板中直接使用locals 中的值，必须从 local_assigns 中拿出来，所以完善了一下这个方法，这样就不用修改upstream 的代码了
  2. 更新ci template

Screenshots or screen recordings

These are strongly recommended to assist reviewers and reduce the time to merge your change.

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

合并请求报告