diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-11 01:12:10 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-11 01:12:48 +0300 |
| commit | a18ebb3c9e5c50a7c33537c1c3f31e3c75d46bf4 (patch) | |
| tree | 50594f64639da09da7bf5016a3c7bb1ffeccc4d0 | |
| parent | 4a9293d352f4b8d2001c8076210d61c21ba3471e (diff) | |
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 be3112800ea..cac843cc807 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. 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 e216f406e1c..ef12853816a 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -120,6 +120,7 @@ class JiraService < IssueTrackerService end def test_settings + return unless api_url.present? result = JiraService.get( jira_api_test_url, headers: { @@ -217,6 +218,7 @@ class JiraService < IssueTrackerService end def send_message(url, message) + return unless api_url.present? result = JiraService.post( url, body: message, @@ -242,6 +244,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: { |