Add latest changes from gitlab-org/gitlab@master

3 files changed, 34 insertions, 7 deletions

diff --git a/doc/administration/issue_closing_pattern.md b/doc/administration/issue_closing_pattern.md
index bdbcdd0093c..1ea6b3bb49c 100644
--- a/doc/administration/issue_closing_pattern.md
+++ b/doc/administration/issue_closing_pattern.md
@@ -8,8 +8,9 @@ type: reference
 # Issue closing pattern **(FREE SELF)**
 
 NOTE:
-This is the administration documentation. There is a separate [user documentation](../user/project/issues/managing_issues.md#closing-issues-automatically)
-on issue closing pattern.
+This page explains how an administrator can configure issue closing patterns.
+For user documentation about the feature, see
+[Closing issues automatically](../user/project/issues/managing_issues.md#closing-issues-automatically).
 
 When a commit or merge request resolves one or more issues, it is possible to
 automatically close these issues when the commit or merge request lands
@@ -21,9 +22,9 @@ The [default issue closing pattern](../user/project/issues/managing_issues.md#de
 covers a wide range of words. You can change the pattern to suit your needs.
 
 NOTE:
-You are advised to use <https://rubular.com> to test the issue closing pattern.
-However, since Rubular doesn't understand `%{issue_ref}`, you can replace this by
-`#\d+` when testing your patterns, which matches only local issue references like `#123`.
+To test the issue closing pattern, use <https://rubular.com>.
+However, Rubular doesn't understand `%{issue_ref}`. When testing your patterns,
+replace this string with `#\d+`, which matches only local issue references like `#123`.
 
 To change the default issue closing pattern:
 
diff --git a/doc/integration/jira/connect-app.md b/doc/integration/jira/connect-app.md
index a4757d5fa80..065b7080b7b 100644
--- a/doc/integration/jira/connect-app.md
+++ b/doc/integration/jira/connect-app.md
@@ -244,3 +244,27 @@ You might get an error if you have installed the GitLab for Jira Cloud app from
   1. Expand the **GitLab for Jira App** section.
   1. Clear the **Jira Connect Proxy URL** text box.
   1. Select **Save changes**.
+
+### Data sync fails with `Invalid JWT` error
+
+If the GitLab for Jira Cloud app continuously fails to sync data, it may be due to an outdated secret token. Atlassian can send new secret tokens that must be processed and stored by GitLab.
+If GitLab fails to store the token or misses the new token request, an `Invalid JWT` error occurs.
+
+To resolve this issue on GitLab self-managed, follow one of the solutions below, depending on your app installation method.
+
+- If you installed the app from the official marketplace listing:
+
+  1. Open the GitLab for Jira Cloud app on Jira.
+  1. Select **Change GitLab version**.
+  1. Select **GitLab.com (SaaS)**.
+  1. Select **Change GitLab version** again.
+  1. Select **GitLab (self-managed)**.
+  1. Enter your **GitLab instance URL**.
+  1. Select **Save**.
+
+- If you [installed the GitLab for Jira Cloud app manually](#install-the-gitlab-for-jira-cloud-app-manually):
+
+  - In GitLab 14.9 and later:
+    - Contact the [Jira Software Cloud support](https://support.atlassian.com/jira-software-cloud/) and ask to trigger a new installed lifecycle event for the GitLab for Jira Cloud app in your namespace.
+  - In all GitLab versions:
+    - Re-install the GitLab for Jira Cloud app. This might remove all already synced development panel data.
diff --git a/doc/user/project/issues/managing_issues.md b/doc/user/project/issues/managing_issues.md
index ca737878ea5..75102cf1e6c 100644
--- a/doc/user/project/issues/managing_issues.md
+++ b/doc/user/project/issues/managing_issues.md
@@ -204,9 +204,11 @@ A reopened issue is no different from any other open issue.
 
 ### Closing issues automatically
 
-You can close issues automatically by using certain words in the commit message or MR description.
+You can close issues automatically by using certain words, called a _closing pattern_,
+in a commit message or merge request description. Administrators of self-managed GitLab instances
+can [change the default closing pattern](../../../administration/issue_closing_pattern.md).
 
-If a commit message or merge request description contains text matching the [defined pattern](#default-closing-pattern),
+If a commit message or merge request description contains text matching the [closing pattern](#default-closing-pattern),
 all issues referenced in the matched text are closed when either:
 
 - The commit is pushed to a project's [**default** branch](../repository/branches/default.md).