From 8a7464317976dc9e2bdad560505dd0959bb03f1f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 14 Nov 2023 09:11:08 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/projects/settings/merge_requests_controller.rb | 1 + app/controllers/projects_controller.rb | 1 + 2 files changed, 2 insertions(+) (limited to 'app/controllers') diff --git a/app/controllers/projects/settings/merge_requests_controller.rb b/app/controllers/projects/settings/merge_requests_controller.rb index f09e324f574..2724e2d9eec 100644 --- a/app/controllers/projects/settings/merge_requests_controller.rb +++ b/app/controllers/projects/settings/merge_requests_controller.rb @@ -52,6 +52,7 @@ module Projects :resolve_outdated_diff_discussions, :only_allow_merge_if_all_discussions_are_resolved, :only_allow_merge_if_pipeline_succeeds, + :allow_merge_without_pipeline, :printing_merge_request_link_enabled, :remove_source_branch_after_merge, :merge_method, diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index cee56dca538..e8c6d6b1f9e 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -497,6 +497,7 @@ class ProjectsController < Projects::ApplicationController :name, :only_allow_merge_if_all_discussions_are_resolved, :only_allow_merge_if_pipeline_succeeds, + :allow_merge_without_pipeline, :path, :printing_merge_request_link_enabled, :public_builds, -- cgit v1.2.3