Skip to content

Add frontend support for group MR settings (part 2)

Zhiyuan Lu requested to merge gitlab-jh/jh-team/gitlab:ce/frontend/feat-merge-checksce into master

This MR completes this issue and this epic at the same time: #372040 (closed) & &8704 (closed)

There are 3 settings that project maintainers can use to control when merges happen:

  • only_allow_merge_if_pipeline_succeeds
  • allow_merge_on_skipped_pipeline
  • only_allow_merge_if_all_discussions_are_resolved

Regulated customers want the ability to control these options at the group level setting (only accessible by Group Owners), that cannot be overridden by the project level setting.

In order to facilitate the code review, I divided it into these MRs:

Screenshots or screen recordings

No UI changes.

What does this current MR do and why?

Move the frontend code related to MR checks from original file to a new file. (to support the extension of EE)

  • Original file: _merge_request_merge_checks_settings.html.haml
  • New file: _merge_request_pipelines_and_threads_options.html.haml

Changlog: changed

Final goal of these MRs

Add Merge requests > Merge checks settings support for group level.

cc @prajnamas

Edited by Zhiyuan Lu

Merge request reports