BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
df413a6c
Commit
df413a6c
authored
Apr 28, 2017
by
Douwe Maan
Committed by
Lin Jen-Shin
Apr 28, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'zj-accept-default-branch-param' into 'master'
Accept default branch param on notifaction services Closes #31173 See merge request !10959
parent
7f9fe93d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
1 deletion
+6
-1
service_params.rb
app/controllers/concerns/service_params.rb
+1
-0
integrations_controller.rb
app/controllers/projects/settings/integrations_controller.rb
+1
-1
zj-accept-default-branch-param.yml
changelogs/unreleased/zj-accept-default-branch-param.yml
+4
-0
No files found.
app/controllers/concerns/service_params.rb
View file @
df413a6c
...
...
@@ -38,6 +38,7 @@ module ServiceParams
:new_issue_url
,
:notify
,
:notify_only_broken_pipelines
,
:notify_only_default_branch
,
:password
,
:priority
,
:project_key
,
...
...
app/controllers/projects/settings/integrations_controller.rb
View file @
df413a6c
...
...
@@ -5,7 +5,7 @@ module Projects
before_action
:authorize_admin_project!
layout
"project_settings"
def
show
@hooks
=
@project
.
hooks
@hook
=
ProjectHook
.
new
...
...
changelogs/unreleased/zj-accept-default-branch-param.yml
0 → 100644
View file @
df413a6c
---
title
:
Ensure the chat notifications service properly saves the "Notify only default branch" setting
merge_request
:
10959
author
:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment