diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-14 12:11:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-14 12:11:08 +0300 |
| commit | 8a7464317976dc9e2bdad560505dd0959bb03f1f (patch) | |
| tree | 372b1101163f6db29fe398739ef091d060cf24c0 /app/controllers | |
| parent | e1d9989e670f5f2fd8b42435835a64b772ae4250 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/settings/merge_requests_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/projects_controller.rb | 1 |
2 files changed, 2 insertions, 0 deletions
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, |