diff options
| -rw-r--r-- | app/controllers/concerns/service_params.rb | 1 | ||||
| -rw-r--r-- | app/controllers/projects/settings/integrations_controller.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/zj-accept-default-branch-param.yml | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/concerns/service_params.rb b/app/controllers/concerns/service_params.rb index a8c0937569c..be2e6c7f193 100644 --- a/app/controllers/concerns/service_params.rb +++ b/app/controllers/concerns/service_params.rb @@ -38,6 +38,7 @@ module ServiceParams :new_issue_url, :notify, :notify_only_broken_pipelines, + :notify_only_default_branch, :password, :priority, :project_key, diff --git a/app/controllers/projects/settings/integrations_controller.rb b/app/controllers/projects/settings/integrations_controller.rb index fb2a4837735..1ff08cce8cb 100644 --- a/app/controllers/projects/settings/integrations_controller.rb +++ b/app/controllers/projects/settings/integrations_controller.rb @@ -5,7 +5,7 @@ module Projects before_action :authorize_admin_project! layout "project_settings" - + def show @hooks = @project.hooks @hook = ProjectHook.new diff --git a/changelogs/unreleased/zj-accept-default-branch-param.yml b/changelogs/unreleased/zj-accept-default-branch-param.yml new file mode 100644 index 00000000000..8f6fa8a6386 --- /dev/null +++ b/changelogs/unreleased/zj-accept-default-branch-param.yml @@ -0,0 +1,4 @@ +--- +title: Ensure the chat notifications service properly saves the "Notify only default branch" setting +merge_request: 10959 +author: |