diff --git a/app/models/integrations/confluence.rb b/app/models/integrations/confluence.rb index f97f1fd25c9344765e5d3970a753433be64f4166..fcdc908ca6761aad032852cbae44a3520dc5ad2c 100644 --- a/app/models/integrations/confluence.rb +++ b/app/models/integrations/confluence.rb @@ -10,7 +10,8 @@ class Confluence < BaseThirdPartyWiki validate :validate_confluence_url_is_cloud, if: :activated? field :confluence_url, - title: -> { _('Confluence Cloud Workspace URL') }, + title: -> { _('Confluence Workspace URL') }, + description: -> { _("URL of the Confluence Workspace hosted on `atlassian.net`.") }, placeholder: 'https://example.atlassian.net/wiki', required: true diff --git a/doc/api/integrations.md b/doc/api/integrations.md index 2017b9cbec9c64204073680357c38f1089245aba..2a5b394b7d70fcaaa906662d65916d84311248a8 100644 --- a/doc/api/integrations.md +++ b/doc/api/integrations.md @@ -372,7 +372,7 @@ Parameters: | Parameter | Type | Required | Description | | --------- | ---- | -------- | ----------- | -| `confluence_url` | string | true | The URL of the Confluence Workspace hosted on `atlassian.net`. | +| `confluence_url` | string | true | URL of the Confluence Workspace hosted on `atlassian.net`. | ### Disable Confluence Workspace diff --git a/lib/api/helpers/integrations_helpers.rb b/lib/api/helpers/integrations_helpers.rb index 4b1312d6ab989ae166a966842eb5ff2dd03b5552..cda1114d5811e3f477ad11b9dd725216e4c33c0b 100644 --- a/lib/api/helpers/integrations_helpers.rb +++ b/lib/api/helpers/integrations_helpers.rb @@ -190,14 +190,7 @@ def self.integrations desc: 'Campfire room' } ], - 'confluence' => [ - { - required: true, - name: :confluence_url, - type: String, - desc: 'The URL of the Confluence Cloud Workspace hosted on atlassian.net' - } - ], + 'confluence' => ::Integrations::Confluence.api_fields, 'custom-issue-tracker' => [ { required: true, diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 941f4cf250a16f9f0d6791393575b191820c5511..cc3136c996d35cc91493ee6a39c7e7c6fa5cc124 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -13189,7 +13189,7 @@ msgstr "" msgid "Confluence" msgstr "" -msgid "Confluence Cloud Workspace URL" +msgid "Confluence Workspace URL" msgstr "" msgid "ConfluenceService|Confluence Workspace" @@ -51775,6 +51775,9 @@ msgstr "" msgid "URL must start with %{codeStart}http://%{codeEnd}, %{codeStart}https://%{codeEnd}, or %{codeStart}ftp://%{codeEnd}" msgstr "" +msgid "URL of the Confluence Workspace hosted on `atlassian.net`." +msgstr "" + msgid "URL of the Grafana instance to link to from the Metrics Dashboard menu item." msgstr ""