summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-16 06:07:12 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-16 06:07:12 +0000
commitb78b8c1103e1e9542891a1c333c8abcd4d7e10ab (patch)
treee6fd1cb9a6fbd4fcb6d9befb61a1773e5c8542c5 /lib
parentfe0260eaa337339a131624a8b71d7a05a3664a18 (diff)
downloadgitlab-ce-b78b8c1103e1e9542891a1c333c8abcd4d7e10ab.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r--lib/api/helpers/integrations_helpers.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/helpers/integrations_helpers.rb b/lib/api/helpers/integrations_helpers.rb
index 701418931f3..4c37a2a5aba 100644
--- a/lib/api/helpers/integrations_helpers.rb
+++ b/lib/api/helpers/integrations_helpers.rb
@@ -595,19 +595,19 @@ module API
required: false,
name: :jira_auth_type,
type: Integer,
- desc: 'The authorization type for Jira'
+ desc: 'The authentication method to be used with Jira. `0` means Basic Authentication. `1` means Jira personal access token. Defaults to `0`'
},
{
required: false,
name: :username,
type: String,
- desc: 'The username of the user created to be used with GitLab/Jira'
+ desc: 'The email or username to be used with Jira. For Jira Cloud use an email, for Jira Data Center and Jira Server use a username. Required when using Basic authentication (`jira_auth_type` is `0`)'
},
{
required: true,
name: :password,
type: String,
- desc: 'The password of the user created to be used with GitLab/Jira'
+ desc: 'The Jira API token, password, or personal access token to be used with Jira. When your authentication method is Basic (`jira_auth_type` is `0`) use an API token for Jira Cloud, or a password for Jira Data Center or Jira Server. When your authentication method is Jira personal access token (`jira_auth_type` is `1`) use a personal access token'
},
{
required: false,