diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-06-01 10:31:33 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-06-01 10:31:33 +0200 |
| commit | 00b00f1edee71d236b0cd5b796bb68f15142911f (patch) | |
| tree | 471ef31c0c455abe44f04dcd7d2ba84e87f22be1 /lib/api/services.rb | |
| parent | f4aa01053ed39a265ddfd9ee6e9618bd3406e59d (diff) | |
| parent | dd0f8b8ccc3b5f61e31703f7391a919b702934a5 (diff) | |
| download | gitlab-ce-00b00f1edee71d236b0cd5b796bb68f15142911f.tar.gz | |
Merge branch 'master' into zj-realtime-env-list
Diffstat (limited to 'lib/api/services.rb')
| -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, |