Commit 666351f2 authored by Russell Dickenson's avatar Russell Dickenson

Merge branch 'sselhorn-master-patch-71017' into 'master'

Added info about where to find all subscriptions

See merge request gitlab-org/gitlab!68799
parents e599a069 9c6c6758
...@@ -116,7 +116,7 @@ before this occurs. ...@@ -116,7 +116,7 @@ before this occurs.
To remove a license file from a self-managed instance: To remove a license file from a self-managed instance:
1. From the top menu, select the Admin Area **{admin}**. 1. From the top menu, select the Admin Area **{admin}**.
1. From the left sidebar, select **Subscription** 1. From the left sidebar, select **Subscription**.
1. Select **Remove license**. 1. Select **Remove license**.
These steps may need to be repeated to completely remove all licenses, including those applied in the past. These steps may need to be repeated to completely remove all licenses, including those applied in the past.
...@@ -124,8 +124,10 @@ These steps may need to be repeated to completely remove all licenses, including ...@@ -124,8 +124,10 @@ These steps may need to be repeated to completely remove all licenses, including
## License history ## License history
You can upload and view more than one license, but only the latest license in the current date You can upload and view more than one license, but only the latest license in the current date
range is used as the active license. When you upload a future-dated license, it range is used as the active license.
doesn't take effect until its applicable date.
When you upload a future-dated license, it doesn't take effect until its applicable date.
You can view all of your active subscriptions in the **Subscription history** table.
NOTE: NOTE:
In GitLab 13.6 and earlier, a notification banner about an expiring license may continue to be displayed even after a new license has been uploaded. In GitLab 13.6 and earlier, a notification banner about an expiring license may continue to be displayed even after a new license has been uploaded.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment