Fix merge_method getter and setting methods

What does this MR do and why?

Failed pipeline: https://jihulab.com/gitlab-cn/gitlab/-/pipelines/1339292/failures

Bug from: !1711 (merged)

  • Add squash option checking to merge_method method;
  • Remove useless project validate method (to fallbacks to fast-forward);
  • Fix merge_method= method.

Screenshots or screen recordings

NonUI

How to set up and validate locally

MR acceptance checklist

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

Baodong 编辑于

合并请求报告

加载中