diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-05-26 17:42:19 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-05-26 17:42:19 +0300 |
commit | 2eb3a40567ba63015e2cdcb2ce2fa762c367fe05 (patch) | |
tree | aac8499b26d5f5d5eb29355a1f5b34e7a9a1aae5 /lib | |
parent | 324af4ac9a1de224236bb0d54d5bd297fb9857ba (diff) | |
parent | 6c17e4f04d06921f8f61bc6aad0ea398dad194f0 (diff) |
Merge branch '31448-jira-urls' into 'master'
Add API URL to JIRA settings
Closes #31448
See merge request !11707
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/services.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/api/services.rb b/lib/api/services.rb index cb07df9e249..47bd9940f77 100644 --- a/lib/api/services.rb +++ b/lib/api/services.rb @@ -304,7 +304,13 @@ module API required: true, name: :url, type: String, - desc: 'The URL to the JIRA project which is being linked to this GitLab project, e.g., https://jira.example.com' + desc: 'The base URL to the JIRA instance web interface which is being linked to this GitLab project. E.g., https://jira.example.com' + }, + { + required: false, + name: :api_url, + type: String, + desc: 'The base URL to the JIRA instance API. Web URL value will be used if not set. E.g., https://jira-api.example.com' }, { required: true, |