Refactored jira issue enforcement method

8691f859 · Aishwarya Subramanian · cb2cb85d · 8691f859
Commit 8691f859 authored Mar 11, 2021 by Aishwarya Subramanian
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

ee/app/models/ee/project.rb ee/app/models/ee/project.rb +1 -3

No files found.
--- a/ee/app/models/ee/project.rb
+++ b/ee/app/models/ee/project.rb
@@ -771,9 +771,7 @@ module EE
    end

    def prevent_merge_without_jira_issue?
-      return false unless jira_issue_association_required_to_merge_enabled?
-
-      prevent_merge_without_jira_issue
+      jira_issue_association_required_to_merge_enabled? && prevent_merge_without_jira_issue
    end

    private