Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
7bb880ae
Commit
7bb880ae
authored
Oct 07, 2019
by
Balasankar "Balu" C
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix protected branch detection in notification branch selection
Signed-off-by:
Balasankar "Balu" C
<
balasankar@gitlab.com
>
parent
67264703
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
app/models/concerns/notification_branch_selection.rb
app/models/concerns/notification_branch_selection.rb
+1
-1
changelogs/unreleased/33582-fix-protected-branch-wildcard.yml
...gelogs/unreleased/33582-fix-protected-branch-wildcard.yml
+5
-0
No files found.
app/models/concerns/notification_branch_selection.rb
View file @
7bb880ae
...
@@ -21,7 +21,7 @@ module NotificationBranchSelection
...
@@ -21,7 +21,7 @@ module NotificationBranchSelection
end
end
is_default_branch
=
ref
==
project
.
default_branch
is_default_branch
=
ref
==
project
.
default_branch
is_protected_branch
=
project
.
protected_branches
.
exists?
(
name:
ref
)
is_protected_branch
=
ProtectedBranch
.
protected?
(
project
,
ref
)
case
branches_to_be_notified
case
branches_to_be_notified
when
"all"
when
"all"
...
...
changelogs/unreleased/33582-fix-protected-branch-wildcard.yml
0 → 100644
View file @
7bb880ae
---
title
:
Fix protected branch detection used by notification service
merge_request
:
18221
author
:
type
:
fixed
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