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
a209e62e
Commit
a209e62e
authored
Jun 19, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix jira integration for EE
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
ae713ae8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
2 deletions
+10
-2
app/models/project.rb
app/models/project.rb
+8
-0
app/services/git_push_service.rb
app/services/git_push_service.rb
+1
-1
app/services/system_note_service.rb
app/services/system_note_service.rb
+1
-1
No files found.
app/models/project.rb
View file @
a209e62e
...
...
@@ -752,4 +752,12 @@ class Project < ActiveRecord::Base
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
app/services/git_push_service.rb
View file @
a209e62e
...
...
@@ -92,7 +92,7 @@ class GitPushService
end
end
if
project
.
default_issues
_tracker?
if
project
.
reference_issue
_tracker?
create_cross_reference_notes
(
commit
,
issues_to_close
)
end
end
...
...
app/services/system_note_service.rb
View file @
a209e62e
...
...
@@ -224,7 +224,7 @@ class SystemNoteService
#
# 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
)
...
...
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