diff options
| author | Drew Blessing <drew@gitlab.com> | 2016-01-07 15:07:13 -0600 |
|---|---|---|
| committer | Drew Blessing <drew@gitlab.com> | 2016-01-07 16:23:42 -0600 |
| commit | f7fdcb95daf235455effa96d00eb082c147ac49e (patch) | |
| tree | 774f4f706fa1e1a45c6c6adca2b9c5e130731385 | |
| parent | b1539116f65c302729ca4130a30169295dcfc07e (diff) | |
| download | gitlab-ce-f7fdcb95daf235455effa96d00eb082c147ac49e.tar.gz | |
Do not call API if there is no API URL
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/models/project_services/jira_service.rb | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index dfee55d963b..2d760c2f53b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -28,6 +28,7 @@ v 8.4.0 (unreleased) - Ajax filter by message for commits page 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 - 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) diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb index a1b77c61576..b6c01c32d9a 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -121,6 +121,7 @@ class JiraService < IssueTrackerService end def test_settings + return unless api_url.present? result = JiraService.get( jira_api_test_url, headers: { @@ -218,6 +219,7 @@ class JiraService < IssueTrackerService end def send_message(url, message) + return unless api_url.present? result = JiraService.post( url, body: message, @@ -243,6 +245,7 @@ class JiraService < IssueTrackerService end def existing_comment?(issue_name, new_comment) + return unless api_url.present? result = JiraService.get( comment_url(issue_name), headers: { |