summaryrefslogtreecommitdiff
path: root/doc/user/admin_area/license.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-19 08:27:35 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-19 08:27:35 +0000
commit7e9c479f7de77702622631cff2628a9c8dcbc627 (patch)
treec8f718a08e110ad7e1894510980d2155a6549197 /doc/user/admin_area/license.md
parente852b0ae16db4052c1c567d9efa4facc81146e88 (diff)
downloadgitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'doc/user/admin_area/license.md')
-rw-r--r--doc/user/admin_area/license.md19
1 files changed, 14 insertions, 5 deletions
diff --git a/doc/user/admin_area/license.md b/doc/user/admin_area/license.md
index c37a61d6748..2b0496b381a 100644
--- a/doc/user/admin_area/license.md
+++ b/doc/user/admin_area/license.md
@@ -8,14 +8,22 @@ type: howto
# Activate GitLab EE with a license **(STARTER ONLY)**
To activate all GitLab Enterprise Edition (EE) functionality, you need to upload
-a license. After you've received your license from GitLab Inc., you can upload it
-by **signing into your GitLab instance as an admin** or adding it at
-installation time.
+a license. It's only possible to activate GitLab Enterprise Edition, so first verify which edition
+you are running. To verify, sign in to GitLab and browse to `/help`. The GitLab edition and version
+are listed at the top of the **Help** page.
+
+If you are running GitLab Community Edition (CE), upgrade your installation to
+GitLab Enterprise Edition (EE). For more details, see [Upgrading between editions](../../update/README.md#upgrading-between-editions).
+If you have questions or need assistance upgrading from GitLab CE to EE please [contact GitLab Support](https://about.gitlab.com/support/#contact-support).
The license is a base64-encoded ASCII text file with a `.gitlab-license`
extension. You can obtain the file by [purchasing a license](https://about.gitlab.com/pricing/)
or by signing up for a [free trial](https://about.gitlab.com/free-trial/).
+After you've received your license from GitLab Inc., you can upload it
+by **signing into your GitLab instance as an admin** or adding it at
+installation time.
+
As of GitLab Enterprise Edition 9.4.0, a newly-installed instance without an
uploaded license only has the Core features active. A trial license
activates all Ultimate features, but after
@@ -108,8 +116,9 @@ To remove a license from a self-managed instance:
## License history
-You can upload and view more than one license,
-but only the latest license is used as the active license.
+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
+doesn't take effect until its applicable date.
## Troubleshooting