diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-02 12:14:26 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-02 12:14:26 +0000 |
commit | ce459835cb32ed396fb7524fb615a5d07f8c51ef (patch) | |
tree | bc56e024828f25d53f8b713b4d8f6393b8755112 /doc | |
parent | 374f3dee7dc0fae10a34daf503b8bf3078008f4b (diff) | |
download | gitlab-ce-ce459835cb32ed396fb7524fb615a5d07f8c51ef.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/integration/jira/connect-app.md | 2 | ||||
-rw-r--r-- | doc/subscriptions/gitlab_com/index.md | 4 | ||||
-rw-r--r-- | doc/update/removals.md | 12 |
3 files changed, 3 insertions, 15 deletions
diff --git a/doc/integration/jira/connect-app.md b/doc/integration/jira/connect-app.md index 402efc409cb..a4c164defe7 100644 --- a/doc/integration/jira/connect-app.md +++ b/doc/integration/jira/connect-app.md @@ -117,7 +117,7 @@ Jira apps can only link to one URL per marketplace listing. The official listing If your instance doesn't meet the prerequisites or you don't want to use the official marketplace listing, you can [install the app manually](#install-the-gitlab-for-jira-cloud-app-manually). -It's not possible to create branches from Jira for self-managed instances. +It's not possible to create branches from Jira for self-managed instances. For more information, see [issue 391432](https://gitlab.com/gitlab-org/gitlab/-/issues/391432). ### Set up your instance diff --git a/doc/subscriptions/gitlab_com/index.md b/doc/subscriptions/gitlab_com/index.md index ef1b6ae7f6f..cd36e426852 100644 --- a/doc/subscriptions/gitlab_com/index.md +++ b/doc/subscriptions/gitlab_com/index.md @@ -171,13 +171,13 @@ The user must not be assigned any other role, anywhere in the instance. - If your project is public, all users, including those with the Guest role can access your project. -### Add users to your subscription +### Add seats to your subscription Your subscription cost is based on the maximum number of seats you use during the billing period. Even if you reach the number of seats in your subscription, you can continue to add users. GitLab [bills you for the overage](../quarterly_reconciliation.md). -To add users to a subscription: +To add seats to a subscription: 1. Log in to the [Customers Portal](https://customers.gitlab.com/). 1. Navigate to the **Manage Purchases** page. diff --git a/doc/update/removals.md b/doc/update/removals.md index a83b10142a9..110a3ee29e8 100644 --- a/doc/update/removals.md +++ b/doc/update/removals.md @@ -34,18 +34,6 @@ For removal reviewers (Technical Writers only): https://about.gitlab.com/handbook/marketing/blog/release-posts/#update-the-removals-doc --> -## Removed in 16.0 - -### Embedding Grafana panels in Markdown is removed - -WARNING: -This is a [breaking change](https://docs.gitlab.com/ee/development/deprecation_guidelines/). -Review the details carefully before upgrading. - -The ability to add Grafana panels in GitLab Flavored Markdown is removed. -We intend to replace this feature with the ability to [embed charts](https://gitlab.com/groups/gitlab-org/opstrace/-/epics/33) -with the [GitLab Observability UI](https://gitlab.com/gitlab-org/opstrace/opstrace-ui). - ## Removed in 15.9 ### Live Preview no longer available in the Web IDE |