Skip to content

执行这段的时候报错

[root@centos-git gitlab-rails]# cat /opt/gitlab/embedded/service/gitlab-rails/VERSION
8.7.0
[root@centos gitlab-rails]# git apply /root/8.7.diff
/root/8.7.diff:7496: trailing whitespace.
- header_title group_title(@group, "设置", edit_group_path(@group))
/root/8.7.diff:7501: trailing whitespace.
    群组设置
/root/8.7.diff:10977: trailing whitespace.
  = "合并请求 #{@merge_request.to_reference}#{@updated_by.name} 更新为 #{@mr_status}"
/root/8.7.diff:21371: trailing whitespace.
      restrict_dependent_destroy: 
/root/8.7.diff:21375: trailing whitespace.
      too_long: 
error: patch failed: app/views/projects/project_members/_shared_group_members.html.haml:3
error: app/views/projects/project_members/_shared_group_members.html.haml: patch does not apply