Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJarka Kadlecova <jarka@gitlab.com>2017-05-23 12:14:43 +0300
committerJarka Kadlecova <jarka@gitlab.com>2017-05-26 16:14:38 +0300
commit6c17e4f04d06921f8f61bc6aad0ea398dad194f0 (patch)
treecf9f5f06cf2c982e43661fe0f7d47578699b405f /lib/api/services.rb
parent8f2af757d3a040dbd81e30e49cb2d575848961b8 (diff)
Add API URL to JIRA settings
Diffstat (limited to 'lib/api/services.rb')
-rw-r--r--lib/api/services.rb8
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,