Merge branch 'api-configure-jira' into 'master'

Validate username/pw for Jiraservice, require them in the API

Closes #36621

See merge request gitlab-org/gitlab-ce!15025

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/api/services.rb b/lib/api/services.rb
index 2cbd0517dc3..1e4f7c29633 100644
--- a/lib/api/services.rb
+++ b/lib/api/services.rb
@@ -313,13 +313,13 @@ module API
           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: false,
+          required: true,
           name: :username,
           type: String,
           desc: 'The username of the user created to be used with GitLab/JIRA'
         },
         {
-          required: false,
+          required: true,
           name: :password,
           type: String,
           desc: 'The password of the user created to be used with GitLab/JIRA'