diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-10 22:12:10 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-01-10 22:12:10 +0000 |
| commit | 4de89291a3c487f41ffe6ebd41877ba7a709d243 (patch) | |
| tree | 8bae99022cce8dc58ec47611857786475ba357fb | |
| parent | efaa4e2386a201b889a099ae351d4eba8aa3c2f8 (diff) | |
| parent | f7fdcb95daf235455effa96d00eb082c147ac49e (diff) | |
| download | gitlab-ce-4de89291a3c487f41ffe6ebd41877ba7a709d243.tar.gz | |
Merge branch 'fix_jira_shortterm' into 'master'
Do not call API if there is no API URL
Fixes #5878
CE users may not be interested in the new JIRA features. In this case,
we should detect they haven't set an API URL and fallback to the
behavior pre-8.3. This patch does that very easily.
There are planned improvements to JIRA in future releases such as
gitlab-org/gitlab-ce#5541 which will make this more configurable.
See merge request !2341
| -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 e12be8b7b65..f7c278823ee 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -33,6 +33,7 @@ v 8.4.0 (unreleased) - API: Add support for deleting a tag via the API (Robert Schilling) 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 - Suppress e-mails on failed builds if allow_failure is set (Stan Hu) - Fix project transfer e-mail sending incorrect paths in e-mail notification (Stan Hu) diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb index 8a43a021819..f6571fc063e 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -116,6 +116,7 @@ class JiraService < IssueTrackerService end def test_settings + return unless api_url.present? result = JiraService.get( jira_api_test_url, headers: { @@ -213,6 +214,7 @@ class JiraService < IssueTrackerService end def send_message(url, message) + return unless api_url.present? result = JiraService.post( url, body: message, @@ -238,6 +240,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: { |