Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'doc/subscriptions')
-rw-r--r--doc/subscriptions/bronze_starter.md6
-rw-r--r--doc/subscriptions/gitlab_com/index.md2
-rw-r--r--doc/subscriptions/img/license-file.pngbin0 -> 72190 bytes
-rw-r--r--doc/subscriptions/img/license-overview.pngbin0 -> 38018 bytes
-rw-r--r--doc/subscriptions/img/publicly-visible.pngbin0 -> 58946 bytes
-rw-r--r--doc/subscriptions/img/support-diagram.pngbin0 -> 49941 bytes
-rw-r--r--doc/subscriptions/index.md102
-rw-r--r--doc/subscriptions/self_managed/index.md30
8 files changed, 120 insertions, 20 deletions
diff --git a/doc/subscriptions/bronze_starter.md b/doc/subscriptions/bronze_starter.md
index a2cca23e5f1..66ab61e48b8 100644
--- a/doc/subscriptions/bronze_starter.md
+++ b/doc/subscriptions/bronze_starter.md
@@ -10,7 +10,9 @@ Although GitLab has discontinued selling the Bronze and Starter tiers, GitLab
continues to honor the entitlements of existing Bronze and Starter tier GitLab
customers for the duration of their contracts at that level.
-These features remain available to Bronze and Starter customers, even though
+New paid features will not be released in Bronze and Starter tiers after GitLab 13.9.
+
+The following features remain available to Bronze and Starter customers, even though
the tiers are no longer mentioned in GitLab documentation:
- [Activate GitLab EE with a license](../user/admin_area/license.md)
@@ -66,7 +68,7 @@ the tiers are no longer mentioned in GitLab documentation:
- [Full code quality reports in the code quality tab](../user/project/merge_requests/code_quality.md#code-quality-reports)
- [Merge request approvals](../user/project/merge_requests/approvals/index.md)
- [Multiple assignees](../user/project/merge_requests/getting_started.md#multiple-assignees)
- - [Approval Rule information for Reviewers](../user/project/merge_requests/getting_started.md#approval-rule-information-for-reviewers) **(PREMIUM)**
+ - [Approval Rule information for Reviewers](../user/project/merge_requests/reviews/index.md#approval-rule-information-for-reviewers) **(PREMIUM)**
- [Required Approvals](../user/project/merge_requests/approvals/index.md#required-approvals)
- [Code Owners as eligible approvers](../user/project/merge_requests/approvals/rules.md#code-owners-as-eligible-approvers)
- [Approval rules](../user/project/merge_requests/approvals/rules.md) features
diff --git a/doc/subscriptions/gitlab_com/index.md b/doc/subscriptions/gitlab_com/index.md
index f35f146f8b9..552f0e28d95 100644
--- a/doc/subscriptions/gitlab_com/index.md
+++ b/doc/subscriptions/gitlab_com/index.md
@@ -291,7 +291,7 @@ Quotas apply to:
1. In the top-right corner, select your avatar.
1. Select **Edit profile**.
- 1. In the left sidebar, select **[Usage Quotas](https://gitlab.com/profile/usage_quotas#pipelines-quota-tab)**.
+ 1. In the left sidebar, select **[Usage Quotas](https://gitlab.com/-/profile/usage_quotas#pipelines-quota-tab)**.
Only pipeline minutes for GitLab shared runners are restricted. If you have a
specific runner set up for your projects, there is no limit to your build time on GitLab SaaS.
diff --git a/doc/subscriptions/img/license-file.png b/doc/subscriptions/img/license-file.png
new file mode 100644
index 00000000000..6516b6b4476
--- /dev/null
+++ b/doc/subscriptions/img/license-file.png
Binary files differ
diff --git a/doc/subscriptions/img/license-overview.png b/doc/subscriptions/img/license-overview.png
new file mode 100644
index 00000000000..d008366fb65
--- /dev/null
+++ b/doc/subscriptions/img/license-overview.png
Binary files differ
diff --git a/doc/subscriptions/img/publicly-visible.png b/doc/subscriptions/img/publicly-visible.png
new file mode 100644
index 00000000000..91e8780e18d
--- /dev/null
+++ b/doc/subscriptions/img/publicly-visible.png
Binary files differ
diff --git a/doc/subscriptions/img/support-diagram.png b/doc/subscriptions/img/support-diagram.png
new file mode 100644
index 00000000000..1628a62f19a
--- /dev/null
+++ b/doc/subscriptions/img/support-diagram.png
Binary files differ
diff --git a/doc/subscriptions/index.md b/doc/subscriptions/index.md
index aff392f61ff..62681d9a657 100644
--- a/doc/subscriptions/index.md
+++ b/doc/subscriptions/index.md
@@ -12,8 +12,8 @@ have access to. Subscriptions are valid for 12 months.
GitLab provides special subscriptions to participants in:
-- [Education](#gitlab-for-education-subscriptions)
-- [Open Source](#gitlab-for-open-source-subscriptions)
+- [Education](#gitlab-for-education)
+- [Open Source](#gitlab-for-open-source)
## Choose a GitLab subscription
@@ -68,7 +68,7 @@ click D "./gitlab_com/index.html#view-your-gitlabcom-subscription"
click E "./self_managed/index.html#view-your-subscription"
```
-## Customers portal
+## Customers Portal
With the [Customers Portal](https://customers.gitlab.com/) you can:
@@ -154,6 +154,8 @@ To change the namespace linked to a subscription:
Subscription charges are calculated based on the total number of users in a group, including its subgroups and nested projects. If the total number of users exceeds the number of seats in your subscription, your account is charged for the additional users.
+Only one namespace can be linked to a subscription.
+
### Change Customers Portal account password
To change the password for this customers portal account:
@@ -163,20 +165,102 @@ To change the password for this customers portal account:
1. Make the required changes to the **Your password** section.
1. Click **Save changes**.
-## GitLab for Education subscriptions
+## Community program subscriptions
+
+### GitLab for Education
+
+For qualifying non-profit educational institutions, the [GitLab for Education](https://about.gitlab.com/solutions/education/) program provides
+the top GitLab tier, plus 50,000 CI minutes per month.
-The GitLab Education license can only be used for instructional-use or
+The GitLab for Education license can only be used for instructional-use or
non-commercial academic research.
-Find more information how to apply and renew at
+Find more information on how to apply and renew at
[GitLab for Education](https://about.gitlab.com/solutions/education/).
-## GitLab for Open Source subscriptions
+### GitLab for Open Source
+
+For qualifying open source projects, the [GitLab for Open Source](https://about.gitlab.com/solutions/open-source/) program provides
+the top GitLab tier, plus 50,000 CI minutes per month.
+
+You can find more information about the [program requirements](https://about.gitlab.com/solutions/open-source/join/#requirements),
+[renewals](https://about.gitlab.com/solutions/open-source/join/$renewals),
+and benefits on the [GitLab for Open Source application page](https://about.gitlab.com/solutions/open-source/join/).
-All [GitLab for Open Source](https://about.gitlab.com/solutions/open-source/)
-requests, including subscription renewals, must be made by using the application process.
If you have any questions, send an email to `opensource@gitlab.com` for assistance.
+#### Verification for Open Source program
+
+As part of the [application verification process](https://about.gitlab.com/solutions/open-source/join/), you must upload <b>three screenshots</b>.
+These are the three screenshots that are needed to qualify you for the GitLab for Open Source program.
+
+- [OSI-approved license overview](#screenshot-1-license-overview)
+- [OSI-approved license file](#screenshot-2-license-file)
+- [Publicly visible settings](#screenshot-3-publicly-visible-settings)
+
+##### OSI-approved license
+
+You must apply an [OSI-approved license](https://opensource.org/licenses/) to each project in your group before you can be verified.
+
+Add the license to the LICENSE file so that it shows up in the overview section of the project. This allows contributors to see it at a glance.
+
+It's best to copy and paste the entire license into the file in its original form. GitLab defaults to **All rights reserved** if no license file is mentioned.
+You must ensure that you add the correct license to each project within your group.
+
+After you ensure that you are using OSI-approved licenses for your projects, you can take your screenshots.
+
+###### Screenshot 1: License overview
+
+On the left sidebar, select **Project Information > Details**. Take a screenshot that includes a view of the license you've chosen for your project.
+
+![License overview](img/license-overview.png)
+
+###### Screenshot 2: License file
+
+Navigate to one of the license files that you uploaded. You can usually find the license file by selecting **Project Information > Details** and scanning the page for the license.
+Make sure the screenshot includes the title of the license.
+
+![License file](img/license-file.png)
+
+##### Screenshot 3: Publicly visible settings
+
+The goal of the GitLab for Open Source program is to enable collaboration on open source projects.
+As a pre-condition to collaboration, people must be able to view the open source project.
+As a result, we ask that all projects under this license are publicly visible.
+
+Follow these instructions to take a screenshot of the publicly visible settings:
+
+ 1. Go to your project and select **Settings**.
+ 1. Expand **Visibility, project features, permissions**.
+ 1. Set **Project Visibility** to **Public**.
+ 1. Ensure others can request access by selecting the **Users can request access** checkbox.
+ 1. Take the screenshot. Include as much of the publicly visible settings as possible. Make sure to include your project's name in the
+ upper-left of the screenshot.
+
+![Publicly visible setting](img/publicly-visible.png)
+
+NOTE:
+From time to time, GitLab allows exceptions. One or two projects within a group can be private if there is a legitimate need for it, for example,
+if a project holds sensitive data. Email `opensource@gitlab.com` with details of your use case to request written permission for exceptions.
+
+### GitLab for Startups
+
+For qualifying startups, the [GitLab for Startups](https://about.gitlab.com/solutions/startups/) program provides
+the top GitLab tier, plus 50,000 CI minutes per month for 12 months.
+
+For more information, including program requirements, see the [Startup program's landing page](https://about.gitlab.com/solutions/startups/).
+
+Send all questions and requests related to the GitLab for Startups program to `startups@gitlab.com`.
+
+### Support for Community Programs
+
+Because these Community Programs are free of cost, regular Priority Support is not included. However, it can be purchased at a 95% discount in some cases.
+If interested, email the relevant community program team: `education@gitlab.com`, `opensource@gitlab.com`, or `startups@gitlab.com`.
+
+As a community member, you can follow this diagram to find support:
+
+![Support diagram](img/support-diagram.png)
+
## Contact Support
Learn more about:
diff --git a/doc/subscriptions/self_managed/index.md b/doc/subscriptions/self_managed/index.md
index 648ad0c70a5..c4484ea609f 100644
--- a/doc/subscriptions/self_managed/index.md
+++ b/doc/subscriptions/self_managed/index.md
@@ -91,8 +91,8 @@ instance, ensure you're purchasing enough seats to
If you are an administrator, you can view the status of your subscription:
-1. Go to **Admin Area**.
-1. From the left-hand menu, select **License**.
+1. On the top bar, select **Menu >** **{admin}** **Admin**.
+1. On the left sidebar, select **License**.
The **License** page includes the following details:
@@ -188,7 +188,7 @@ We recommend following these steps during renewal:
1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in) and select the **Renew** button beneath your existing subscription.
NOTE:
- If you need to change your [GitLab tier](https://about.gitlab.com/pricing/), contact our sales team via `renewals@gitlab.com` for assistance as this can't be done in the Customers Portal.
+ If you need to change your [GitLab tier](https://about.gitlab.com/pricing/), contact our sales team via [the sales contact form](https://about.gitlab.com/sales/) for assistance as this can't be done in the Customers Portal.
1. In the first box, enter the total number of user licenses you'll need for the upcoming year. Be sure this number is at least **equal to, or greater than** the number of billable users in the system at the time of performing the renewal.
1. Enter the number of [users over license](#users-over-license) in the second box for the user overage incurred in your previous subscription term.
@@ -209,9 +209,14 @@ Seat Link daily sends a count of all users in connected GitLab self-managed inst
Seat Link provides **only** the following information to GitLab:
- Date
+- Timestamp
- License key
- Historical maximum user count
- Billable users count
+- GitLab version
+- Hostname
+- Instance ID
+- MD5 hash of license
For offline or closed network customers, the existing [true-up model](#users-over-license) is used. Prorated charges are not possible without user count data.
@@ -220,6 +225,8 @@ For offline or closed network customers, the existing [true-up model](#users-ove
<pre><code>
{
+ gitlab_version: '13.12.0',
+ timestamp: '2020-01-29T18:25:57+00:00',
date: '2020-01-29',
license_key: 'ZXlKa1lYUmhJam9pWm5WNmVsTjVZekZ2YTJoV2NucDBh
RXRxTTA5amQxcG1VMVZqDQpXR3RwZEc5SGIyMVhibmxuZDJ0NWFrNXJTVzVH
@@ -255,8 +262,9 @@ TjJ4eVlVUkdkWEJtDQpkSHByYWpreVJrcG9UVlo0Y0hKSU9URndiV2RzVFdO
VlhHNXRhVmszTkV0SVEzcEpNMWRyZEVoRU4ydHINCmRIRnFRVTlCVUVVM1pV
SlRORE4xUjFaYVJGb3JlWGM5UFZ4dUlpd2lhWFlpt2lKV00yRnNVbk5RTjJk
Sg0KU1hNMGExaE9SVGR2V2pKQlBUMWNiaUo5DQo=',
- max_historical_user_count: 10,
- active_users: 6
+ hostname: 'gitlab.example.com',
+ instance_id: 'c1ac02cb-cb3f-4120-b7fe-961bbfa3abb7',
+ license_md5: '7cd897fffb3517dddf01b79a0889b515'
}
</code></pre>
@@ -264,8 +272,9 @@ Sg0KU1hNMGExaE9SVGR2V2pKQlBUMWNiaUo5DQo=',
You can view the exact JSON payload in the administration panel. To view the payload:
-1. Navigate to **Admin Area > Settings > Metrics and profiling** and expand **Seat Link**.
-1. Click **Preview payload**.
+1. On the top bar, select **Menu >** **{admin}** **Admin**.
+1. On the left sidebar, select **Settings > Metrics and profiling** and expand **Seat Link**.
+1. Select **Preview payload**.
#### Disable Seat Link
@@ -273,7 +282,12 @@ You can view the exact JSON payload in the administration panel. To view the pay
Seat Link is enabled by default.
-To disable this feature, go to **Admin Area > Settings > Metrics and profiling**, uncheck the **Enable Seat Link** checkbox > **Save changes**.
+To disable this feature:
+
+1. On the top bar, select **Menu >** **{admin}** **Admin**.
+1. On the left sidebar, select **Settings > Metrics and profiling** and expand **Seat Link**.
+1. Clear the **Enable Seat Link** checkbox.
+1. Select **Save changes**.
To disable Seat Link in an Omnibus GitLab installation, and prevent it from
being configured in the future through the administration panel, set the following in