Merge branch '326140-aqualls-blend-revisions' into 'master'

Fix Jira pages after rebases clobbered each other

See merge request gitlab-org/gitlab!57897

doc/integration/jira/connect-app.md

@@ -49,6 +49,73 @@ Support for syncing past branch and commit data [is planned](https://gitlab.com/
 
 For more information, see [Usage](index.md#usage).
 
+## Install the GitLab Jira Cloud application for self-managed instances **(FREE SELF)**
+
+If your GitLab instance is self-managed, you must follow some
+extra steps to install the GitLab Jira Cloud application.
+
+Each Jira Cloud application must be installed from a single location. Jira fetches
+a [manifest file](https://developer.atlassian.com/cloud/jira/platform/connect-app-descriptor/)
+from the location you provide. The manifest file describes the application to the system. To support
+self-managed GitLab instances with Jira Cloud, you can either:
+
+- [Install the application manually](#install-the-application-manually).
+- [Create a Marketplace listing](#create-a-marketplace-listing).
+
+### Install the application manually **(FREE SELF)**
+
+You can configure your Atlassian Cloud instance to allow you to install applications
+from outside the Marketplace, which allows you to install the application:
+
+1. Sign in to your Jira instance as a user with administrator permissions.
+1. Place your Jira instance into
+   [development mode](https://developer.atlassian.com/cloud/jira/platform/getting-started-with-connect/#step-2--enable-development-mode).
+1. Sign in to your GitLab application as a user with [Administrator](../../user/permissions.md) permissions.
+1. Install the GitLab application from your self-managed GitLab instance, as
+   described in the [Atlassian developer guides](https://developer.atlassian.com/cloud/jira/platform/getting-started-with-connect/#step-3--install-and-test-your-app)).
+1. In your Jira instance, go to **Apps > Manage Apps** and click **Upload app**:
+
+   ![Image showing button labeled "upload app"](img/jira-upload-app_v13_11.png)
+
+1. For **App descriptor URL**, provide full URL to your manifest file, modifying this
+   URL based on your instance configuration: `https://your.domain/your-path/-/jira_connect/app_descriptor.json`
+1. Click **Upload**, and Jira fetches the content of your `app_descriptor` file and installs
+   it for you.
+1. If the upload is successful, Jira displays a modal panel: **Installed and ready to go!**
+   Click **Get started** to configure the integration.
+
+   ![Image showing success modal](img/jira-upload-app-success_v13_11.png)
+
+The **GitLab for Jira** app now displays under **Manage apps**. You can also
+click **Get started** to open the configuration page rendered from your GitLab instance.
+
+NOTE:
+If you make changes to the application descriptor, you must uninstall, then reinstall, the
+application.
+
+### Create a Marketplace listing **(FREE SELF)**
+
+If you prefer to not use development mode on your Jira instance, you can create
+your own Marketplace listing for your instance, which enables your application
+to be installed from the Atlassian Marketplace.
+
+For full instructions, review the Atlassian [guide to creating a marketplace listing](https://developer.atlassian.com/platform/marketplace/installing-cloud-apps/#creating-the-marketplace-listing). To create a
+Marketplace listing, you must:
+
+1. Register as a Marketplace vendor.
+1. List your application, using the application descriptor URL.
+   - Your manifest file is located at: `https://your.domain/your-path/-/jira_connect/app_descriptor.json`
+   - GitLab recommends you list your application as `private`, because public
+     applications can be viewed and installed by any user.
+1. Generate test license tokens for your application.
+
+Review the
+[official Atlassian documentation](https://developer.atlassian.com/platform/marketplace/installing-cloud-apps/#creating-the-marketplace-listing)
+for details.
+
+NOTE:
+DVCS means distributed version control system.
+
 ## Troubleshooting GitLab for Jira
 
 The GitLab for Jira App uses an iframe to add namespaces on the settings page. Some browsers block cross-site cookies. This can lead to a message saying that the user needs to log in on GitLab.com even though the user is already logged in.