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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
e7364050
Commit
e7364050
authored
Feb 29, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'issue_5854' into 'master'
This reverts merge request !2992
parent
6f85eb38
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
app/models/project_services/jira_service.rb
app/models/project_services/jira_service.rb
+2
-4
No files found.
app/models/project_services/jira_service.rb
View file @
e7364050
...
@@ -108,8 +108,7 @@ class JiraService < IssueTrackerService
...
@@ -108,8 +108,7 @@ class JiraService < IssueTrackerService
},
},
entity:
{
entity:
{
name:
noteable_name
.
humanize
.
downcase
,
name:
noteable_name
.
humanize
.
downcase
,
url:
entity_url
,
url:
entity_url
title:
noteable
.
title
}
}
}
}
...
@@ -197,11 +196,10 @@ class JiraService < IssueTrackerService
...
@@ -197,11 +196,10 @@ class JiraService < IssueTrackerService
user_url
=
data
[
:user
][
:url
]
user_url
=
data
[
:user
][
:url
]
entity_name
=
data
[
:entity
][
:name
]
entity_name
=
data
[
:entity
][
:name
]
entity_url
=
data
[
:entity
][
:url
]
entity_url
=
data
[
:entity
][
:url
]
entity_title
=
data
[
:entity
][
:title
]
project_name
=
data
[
:project
][
:name
]
project_name
=
data
[
:project
][
:name
]
message
=
{
message
=
{
body:
%Q{[
#{
user_name
}
|
#{
user_url
}
] mentioned this issue in [a
#{
entity_name
}
of
#{
project_name
}
|
#{
entity_url
}
]:
\n
"
#{
entity_title
}
"}
body:
"[
#{
user_name
}
|
#{
user_url
}
] mentioned this issue in [a
#{
entity_name
}
of
#{
project_name
}
|
#{
entity_url
}
]."
}
}
unless
existing_comment?
(
issue_name
,
message
[
:body
])
unless
existing_comment?
(
issue_name
,
message
[
:body
])
...
...
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