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
2345197d
Commit
2345197d
authored
Jan 25, 2019
by
Mark Chao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only validate once approval_rules is enabled
parent
f976a897
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
0 deletions
+1
-0
ee/app/models/ee/merge_request.rb
ee/app/models/ee/merge_request.rb
+1
-0
No files found.
ee/app/models/ee/merge_request.rb
View file @
2345197d
...
@@ -58,6 +58,7 @@ module EE
...
@@ -58,6 +58,7 @@ module EE
end
end
def
validate_approval_rule_source
def
validate_approval_rule_source
return
if
::
Feature
.
disabled?
(
:approval_rules
,
project
)
return
unless
approval_rules
.
any?
return
unless
approval_rules
.
any?
local_project_rule_ids
=
approval_rules
.
map
{
|
rule
|
rule
.
approval_merge_request_rule_source
&
.
approval_project_rule_id
}
local_project_rule_ids
=
approval_rules
.
map
{
|
rule
|
rule
.
approval_merge_request_rule_source
&
.
approval_project_rule_id
}
...
...
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