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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
f7fdcb95
Commit
f7fdcb95
authored
Jan 07, 2016
by
Drew Blessing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not call API if there is no API URL
parent
b1539116
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
CHANGELOG
CHANGELOG
+1
-0
app/models/project_services/jira_service.rb
app/models/project_services/jira_service.rb
+3
-0
No files found.
CHANGELOG
View file @
f7fdcb95
...
@@ -28,6 +28,7 @@ v 8.4.0 (unreleased)
...
@@ -28,6 +28,7 @@ v 8.4.0 (unreleased)
- Ajax filter by message for commits page
- Ajax filter by message for commits page
v 8.3.3 (unreleased)
v 8.3.3 (unreleased)
- Preserve CE behavior with JIRA integration by only calling API if URL is set
- Get "Merge when build succeeds" to work when commits were pushed to MR target branch while builds were running
- Get "Merge when build succeeds" to work when commits were pushed to MR target branch while builds were running
- Fix project transfer e-mail sending incorrect paths in e-mail notification (Stan Hu)
- Fix project transfer e-mail sending incorrect paths in e-mail notification (Stan Hu)
- Enable "Add key" button when user fills in a proper key (Stan Hu)
- Enable "Add key" button when user fills in a proper key (Stan Hu)
...
...
app/models/project_services/jira_service.rb
View file @
f7fdcb95
...
@@ -121,6 +121,7 @@ class JiraService < IssueTrackerService
...
@@ -121,6 +121,7 @@ class JiraService < IssueTrackerService
end
end
def
test_settings
def
test_settings
return
unless
api_url
.
present?
result
=
JiraService
.
get
(
result
=
JiraService
.
get
(
jira_api_test_url
,
jira_api_test_url
,
headers:
{
headers:
{
...
@@ -218,6 +219,7 @@ class JiraService < IssueTrackerService
...
@@ -218,6 +219,7 @@ class JiraService < IssueTrackerService
end
end
def
send_message
(
url
,
message
)
def
send_message
(
url
,
message
)
return
unless
api_url
.
present?
result
=
JiraService
.
post
(
result
=
JiraService
.
post
(
url
,
url
,
body:
message
,
body:
message
,
...
@@ -243,6 +245,7 @@ class JiraService < IssueTrackerService
...
@@ -243,6 +245,7 @@ class JiraService < IssueTrackerService
end
end
def
existing_comment?
(
issue_name
,
new_comment
)
def
existing_comment?
(
issue_name
,
new_comment
)
return
unless
api_url
.
present?
result
=
JiraService
.
get
(
result
=
JiraService
.
get
(
comment_url
(
issue_name
),
comment_url
(
issue_name
),
headers:
{
headers:
{
...
...
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