diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 5146a44de839ff7369afe3630d164614a3807e3f..90cb8749d48216a571406f4cde0b2666e231c307 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -41,6 +41,10 @@ class ProjectsController < Projects::ApplicationController push_frontend_feature_flag(:service_desk_custom_address, @project) end + before_action only: [:edit] do + push_frontend_feature_flag(:approval_suggestions, @project) + end + layout :determine_layout def index diff --git a/ee/app/assets/javascripts/approvals/components/modal_rule_create.vue b/ee/app/assets/javascripts/approvals/components/modal_rule_create.vue index 4e05b4b229039c98c6a27916af9814cad500f1fc..370e9be76c48f20b96c4615c74f4871d731c5037 100644 --- a/ee/app/assets/javascripts/approvals/components/modal_rule_create.vue +++ b/ee/app/assets/javascripts/approvals/components/modal_rule_create.vue @@ -25,7 +25,12 @@ export default { rule: 'data', }), title() { - return this.rule ? __('Update approval rule') : __('Add approval rule'); + return !this.rule || this.defaultRuleName + ? __('Add approval rule') + : __('Update approval rule'); + }, + defaultRuleName() { + return this.rule?.defaultRuleName; }, }, methods: { @@ -47,6 +52,11 @@ export default { size="sm" @ok.prevent="submit" > - + diff --git a/ee/app/assets/javascripts/approvals/components/project_settings/project_rules.vue b/ee/app/assets/javascripts/approvals/components/project_settings/project_rules.vue index c252daaedc8cd4a1a00157de33e9362501f43ca0..146d581abc0418ce9e33338a2cee7f9012c4fd28 100644 --- a/ee/app/assets/javascripts/approvals/components/project_settings/project_rules.vue +++ b/ee/app/assets/javascripts/approvals/components/project_settings/project_rules.vue @@ -1,13 +1,16 @@