Skip to content
Snippets Groups Projects
Commit bf596d56 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Fix jira integration for EE

parent 9212ae43
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -752,4 +752,12 @@ def create_wiki
errors.add(:base, 'Failed create wiki')
false
end
def reference_issue_tracker?
default_issues_tracker? || jira_tracker_active?
end
def jira_tracker_active?
jira_tracker? && jira_service.active
end
end
Loading
Loading
@@ -92,7 +92,7 @@ def process_commit_messages(ref)
end
end
 
if project.default_issues_tracker?
if project.reference_issue_tracker?
create_cross_reference_notes(commit, issues_to_close)
end
end
Loading
Loading
Loading
Loading
@@ -224,7 +224,7 @@ def self.cross_reference?(note_text)
#
# Returns Boolean
def self.cross_reference_disallowed?(noteable, mentioner)
return true if noteable.is_a?(ExternalIssue)
return true if noteable.is_a?(ExternalIssue) && !noteable.project.jira_tracker_active?
return false unless mentioner.is_a?(MergeRequest)
return false unless noteable.is_a?(Commit)
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment