summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-04-28 14:06:05 +0000
committerDouwe Maan <douwe@gitlab.com>2017-04-28 14:06:05 +0000
commit6ef988aa0b6a40ea1671f7617bf13d9b9eba9d97 (patch)
tree1318ad35f424d20a0b1fa59f4440f373aded94a1
parente57545351b22f7d31839c4fc2f4bb760ef0e75a4 (diff)
parent3155f5a2723403aa36432a2e95e1dd30c78cfb94 (diff)
downloadgitlab-ce-6ef988aa0b6a40ea1671f7617bf13d9b9eba9d97.tar.gz
Merge branch 'zj-accept-default-branch-param' into 'master'
Accept default branch param on notifaction services Closes #31173 See merge request !10959
-rw-r--r--app/controllers/concerns/service_params.rb1
-rw-r--r--app/controllers/projects/settings/integrations_controller.rb2
-rw-r--r--changelogs/unreleased/zj-accept-default-branch-param.yml4
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: