Skip to content
Snippets Groups Projects
Commit 7e89fb5f authored by pburdette's avatar pburdette
Browse files

Introduce new mr setting

Introdue allow merge before
piplines complete setting.
parent 592fd99f
No related merge requests found
......@@ -412,6 +412,7 @@ class Project < ApplicationRecord
delegate :default_git_depth, :default_git_depth=, to: :ci_cd_settings, prefix: :ci
delegate :forward_deployment_enabled, :forward_deployment_enabled=, :forward_deployment_enabled?, to: :ci_cd_settings, prefix: :ci
delegate :keep_latest_artifact, :keep_latest_artifact=, :keep_latest_artifact?, :keep_latest_artifacts_available?, to: :ci_cd_settings
delegate :allow_merge_before_pipeline_completes, :allow_merge_before_pipeline_completes=, :allow_merge_before_pipeline_completes?, to: :ci_cd_settings
delegate :restrict_user_defined_variables, :restrict_user_defined_variables=, :restrict_user_defined_variables?,
to: :ci_cd_settings
delegate :actual_limits, :actual_plan_name, to: :namespace, allow_nil: true
......
......@@ -5,6 +5,12 @@
%p.text-secondary= s_('ProjectSettings|Additional merge request capabilities that influence how and when merges will be performed')
= render_if_exists 'projects/merge_pipelines_settings', form: form
= render_if_exists 'projects/merge_trains_settings', form: form
.form-check.mb-2
= form.check_box :allow_merge_before_pipeline_completes, class: 'form-check-input'
= form.label :allow_merge_before_pipeline_completes, class: 'form-check-label' do
= s_('ProjectSettings|Allow merge before pipeline(s) complete')
.descr.text-secondary
= html_escape(s_('ProjectSettings|Merge requests can be merged before pipeline(s) complete by using the %{strong_open}Merge immediately%{strong_close} button, or an API call.')) % { strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
.form-check.mb-2
= form.check_box :resolve_outdated_diff_discussions, class: 'form-check-input'
= form.label :resolve_outdated_diff_discussions, class: 'form-check-label' do
......
......@@ -23279,6 +23279,9 @@ msgstr ""
msgid "ProjectSettings|Allow editing commit messages"
msgstr ""
 
msgid "ProjectSettings|Allow merge before pipeline(s) complete"
msgstr ""
msgid "ProjectSettings|Always show thumbs-up and thumbs-down award emoji buttons on issues, merge requests, and snippets."
msgstr ""
 
......@@ -23411,6 +23414,9 @@ msgstr ""
msgid "ProjectSettings|Merge requests"
msgstr ""
 
msgid "ProjectSettings|Merge requests can be merged before pipeline(s) complete by using the %{strong_open}Merge immediately%{strong_close} button, or an API call."
msgstr ""
msgid "ProjectSettings|Merge suggestions"
msgstr ""
 
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment