Merge branch 'tw-okr-integrations-flowdock' into 'master'

OKR: Review UI text and docs for Flowdock integration

See merge request gitlab-org/gitlab!59388

app/models/project_services/flowdock_service.rb

 # frozen_string_literal: true
 
 class FlowdockService < Service
+  include ActionView::Helpers::UrlHelper
   prop_accessor :token
   validates :token, presence: true, if: :activated?
 
@@ -9,7 +10,12 @@ class FlowdockService < Service
   end
 
   def description
-    s_('FlowdockService|Flowdock is a collaboration web app for technical teams.')
+    s_('FlowdockService|Send event notifications from GitLab to Flowdock flows.')
+  end
+
+  def help
+    docs_link = link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('api/services', anchor: 'flowdock'), target: '_blank', rel: 'noopener noreferrer'
+    s_('FlowdockService|Send event notifications from GitLab to Flowdock flows. %{docs_link}').html_safe % { docs_link: docs_link.html_safe }
   end
 
   def self.to_param
@@ -18,7 +24,7 @@ class FlowdockService < Service
 
   def fields
     [
-      { type: 'text', name: 'token', placeholder: s_('FlowdockService|Flowdock Git source token'), required: true }
+      { type: 'text', name: 'token', placeholder: s_('FlowdockService|1b609b52537...'), required: true, help: 'Enter your Flowdock token.' }
     ]
   end
 

changelogs/unreleased/tw-okr-integrations-flowdock.yml

+---
+title: Review UI text and docs for Flowdock integration
+merge_request: 59388
+author:
+type: other

doc/api/services.md

@@ -572,7 +572,9 @@ GET /projects/:id/services/external-wiki
 
 ## Flowdock
 
-Flowdock is a collaboration web app for technical teams.
+Flowdock is a ChatOps application for collaboration in software engineering
+companies. You can send notifications from GitLab events to Flowdock flows.
+For integration instructions, see the [Flowdock documentation](https://www.flowdock.com/help/gitlab).
 
 ### Create/Edit Flowdock service
 

doc/user/project/integrations/overview.md

@@ -39,7 +39,7 @@ Click on the service links to see further configuration instructions and details
 | [Emails on push](emails_on_push.md)                       | Send commits and diff of each push by email.                                                 | **{dotted-circle}** No |
 | [EWM](ewm.md)                                             | Use IBM Engineering Workflow Management as the issue tracker.                                | **{dotted-circle}** No |
 | [External wiki](../wiki/index.md#link-an-external-wiki)   | Link an external wiki.                                          | **{dotted-circle}** No |
-| Flowdock                                                  | Use Flowdock with GitLab.                                                                    | **{dotted-circle}** No |
+| [Flowdock](../../../api/services.md#flowdock)             | Send notifications from GitLab to Flowdock flows. | **{dotted-circle}** No |
 | [GitHub](github.md)                                       | Obtain statuses for commits and pull requests.                                               | **{dotted-circle}** No |
 | [Hangouts Chat](hangouts_chat.md)                         | Receive events notifications.                                                                | **{dotted-circle}** No |
 | [Irker (IRC gateway)](irker.md)                           | Send IRC messages.                                                                           | **{dotted-circle}** No |

locale/gitlab.pot

@@ -13930,10 +13930,13 @@ msgstr ""
 msgid "Flags"
 msgstr ""
 
-msgid "FlowdockService|Flowdock Git source token"
+msgid "FlowdockService|1b609b52537..."
 msgstr ""
 
-msgid "FlowdockService|Flowdock is a collaboration web app for technical teams."
+msgid "FlowdockService|Send event notifications from GitLab to Flowdock flows."
+msgstr ""
+
+msgid "FlowdockService|Send event notifications from GitLab to Flowdock flows. %{docs_link}"
 msgstr ""
 
 msgid "Focus filter bar"