Commit 7ffc5b84 authored by Marcel Amirault's avatar Marcel Amirault Committed by Achilleas Pipinellis

Docs: (EE Port) Merge EE doc/user/admin_area to CE

parent db1c3085
...@@ -72,7 +72,7 @@ Learn how to install, configure, update, and maintain your GitLab instance. ...@@ -72,7 +72,7 @@ Learn how to install, configure, update, and maintain your GitLab instance.
- [Branded login page](../customization/branded_login_page.md): Customize the login page with your own logo, title, and description. - [Branded login page](../customization/branded_login_page.md): Customize the login page with your own logo, title, and description.
- [Welcome message](../customization/welcome_message.md): Add a custom welcome message to the sign-in page. - [Welcome message](../customization/welcome_message.md): Add a custom welcome message to the sign-in page.
- ["New Project" page](../customization/new_project_page.md): Customize the text to be displayed on the page that opens whenever your users create a new project. - ["New Project" page](../customization/new_project_page.md): Customize the text to be displayed on the page that opens whenever your users create a new project.
- [Additional custom email text](../user/admin_area/settings/email.md#custom-additional-text): Add additional custom text to emails sent from GitLab. **[PREMIUM ONLY]** - [Additional custom email text](../user/admin_area/settings/email.md#custom-additional-text-premium-only): Add additional custom text to emails sent from GitLab. **[PREMIUM ONLY]**
### Maintaining GitLab ### Maintaining GitLab
......
# Geo nodes admin area **[PREMIUM ONLY]** # Geo nodes admin area **[PREMIUM ONLY]**
For more information about setting up GitLab Geo, read the For more information about setting up GitLab Geo, read the
[Geo documentation](../../gitlab-geo/README.md). [Geo documentation](https://docs.gitlab.com/ee/administration/geo/replication/index.html).
When you're done, you can navigate to **Admin area > Geo** (`/admin/geo/nodes`). When you're done, you can navigate to **Admin area > Geo** (`/admin/geo/nodes`).
...@@ -25,7 +25,7 @@ changes on the **primary** node! ...@@ -25,7 +25,7 @@ changes on the **primary** node!
| Setting | Description | | Setting | Description |
|---------------------------|-------------| |---------------------------|-------------|
| Selective synchronization | Enable Geo [selective sync](../../administration/geo/replication/configuration.md#selective-synchronization) for this **secondary** node. | | Selective synchronization | Enable Geo [selective sync](https://docs.gitlab.com/ee/administration/geo/replication/configuration.html#selective-synchronization) for this **secondary** node. |
| Repository sync capacity | Number of concurrent requests this **secondary** node will make to the **primary** node when backfilling repositories. | | Repository sync capacity | Number of concurrent requests this **secondary** node will make to the **primary** node when backfilling repositories. |
| File sync capacity | Number of concurrent requests this **secondary** node will make to the **primary** node when backfilling files. | | File sync capacity | Number of concurrent requests this **secondary** node will make to the **primary** node when backfilling files. |
......
...@@ -16,14 +16,14 @@ The Admin Area is made up of the following sections: ...@@ -16,14 +16,14 @@ The Admin Area is made up of the following sections:
| Section | Description | | Section | Description |
|:---------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------| |:---------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------|
| Overview | View your GitLab [Dashboard](#admin-dashboard), and administer [projects](#administer-projects), users, groups, jobs, runners, and Gitaly servers. | | Overview | View your GitLab [Dashboard](#admin-dashboard), and administer [projects](#administer-projects), users, groups, jobs, runners, and Gitaly servers. |
| Monitoring | View GitLab system information, and information on background jobs, logs, [health checks](monitoring/health_check.md), request profiles, and audit logs. | | Monitoring | View GitLab system information, and information on background jobs, logs, [health checks](monitoring/health_check.md), request profiles, and audit logs. |
| Messages | Send and manage [broadcast messages](broadcast_messages.md) for your users. | | Messages | Send and manage [broadcast messages](broadcast_messages.md) for your users. |
| System Hooks | Configure [system hooks](../../system_hooks/system_hooks.md) for many events. | | System Hooks | Configure [system hooks](../../system_hooks/system_hooks.md) for many events. |
| Applications | Create system [OAuth applications](../../integration/oauth_provider.md) for integrations with other services. | | Applications | Create system [OAuth applications](../../integration/oauth_provider.md) for integrations with other services. |
| Abuse Reports | Manage [abuse reports](abuse_reports.md) submitted by your users. | | Abuse Reports | Manage [abuse reports](abuse_reports.md) submitted by your users. |
| License **[STARTER ONLY]** | Upload, display, and remove [licenses](license.md). | | License **[STARTER ONLY]** | Upload, display, and remove [licenses](license.md). |
| Push Rules **[STARTER]** | Configure pre-defined git [push rules](../../push_rules/push_rules.md) for projects. | | Push Rules **[STARTER]** | Configure pre-defined git [push rules](https://docs.gitlab.com/ee/push_rules/push_rules.html) for projects. |
| Geo **[PREMIUM ONLY]** | Configure and maintain [Geo nodes](geo_nodes.md). | | Geo **[PREMIUM ONLY]** | Configure and maintain [Geo nodes](geo_nodes.md). |
| Deploy Keys | Create instance-wide [SSH deploy keys](../../ssh/README.md#deploy-keys). | | Deploy Keys | Create instance-wide [SSH deploy keys](../../ssh/README.md#deploy-keys). |
| Service Templates | Create [service templates](../project/integrations/services_templates.md) for projects. | | Service Templates | Create [service templates](../project/integrations/services_templates.md) for projects. |
...@@ -51,7 +51,6 @@ The Dashboard is the default view of the Admin Area, and is made up of the follo ...@@ -51,7 +51,6 @@ The Dashboard is the default view of the Admin Area, and is made up of the follo
| Features | All features available on the GitLab instance. Enabled features are marked with a green circle icon, and disabled features are marked with a power icon. | | Features | All features available on the GitLab instance. Enabled features are marked with a green circle icon, and disabled features are marked with a power icon. |
| Components | The major components of GitLab and the version number of each. A link to the Gitaly Servers is also included. | | Components | The major components of GitLab and the version number of each. A link to the Gitaly Servers is also included. |
## Administer Projects ## Administer Projects
You can administer all projects in the GitLab instance from the Admin Area's Projects page. You can administer all projects in the GitLab instance from the Admin Area's Projects page.
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
The logo in the header of some emails can be customized, see the [logo customization section](../../../customization/branded_page_and_email_header.md). The logo in the header of some emails can be customized, see the [logo customization section](../../../customization/branded_page_and_email_header.md).
## Custom additional text ## Custom additional text **[PREMIUM ONLY]**
>[Introduced][ee-5031] in [GitLab Premium][eep] 10.7. >[Introduced][ee-5031] in [GitLab Premium][eep] 10.7.
...@@ -34,5 +34,5 @@ In order to change this option: ...@@ -34,5 +34,5 @@ In order to change this option:
1. Hit **Save** for the changes to take effect. 1. Hit **Save** for the changes to take effect.
NOTE: **Note**: Once the hostname gets configured, every private commit email using the previous hostname, will not get NOTE: **Note**: Once the hostname gets configured, every private commit email using the previous hostname, will not get
recognized by GitLab. This can directly conflict with certain [Push rules](../../../push_rules/push_rules.md) such as recognized by GitLab. This can directly conflict with certain [Push rules](https://docs.gitlab.com/ee/push_rules/push_rules.html) such as
`Check whether author is a GitLab user` and `Check whether committer is the current authenticated user`. `Check whether author is a GitLab user` and `Check whether committer is the current authenticated user`.
# External authorization control **[PREMIUM]** # External authorization control **[CORE ONLY]**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/4216) in > [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/4216) in
> [GitLab Premium](https://about.gitlab.com/pricing) 10.6. > [GitLab Premium](https://about.gitlab.com/pricing) 10.6.
> [Moved](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/27056) to
> [GitLab Core](https://about.gitlab.com/pricing/) in 11.10.
In highly controlled environments, it may be necessary for access policy to be In highly controlled environments, it may be necessary for access policy to be
controlled by an external service that permits access based on project controlled by an external service that permits access based on project
......
...@@ -6,7 +6,7 @@ instance like sign-up restrictions, account limits and quota, metrics, etc. ...@@ -6,7 +6,7 @@ instance like sign-up restrictions, account limits and quota, metrics, etc.
Navigate to it by going to **Admin area > Settings**. Some of the settings Navigate to it by going to **Admin area > Settings**. Some of the settings
include: include:
- [Account and limit settings](account_and_limit_settings.md) - [Account and limit settings](account_and_limit_settings.md) **[STARTER]**
- [Continuous Integration and Deployment](continuous_integration.md) - [Continuous Integration and Deployment](continuous_integration.md)
- [Email](email.md) - [Email](email.md)
- [Sign up restrictions](sign_up_restrictions.md) - [Sign up restrictions](sign_up_restrictions.md)
...@@ -14,7 +14,7 @@ include: ...@@ -14,7 +14,7 @@ include:
- [Third party offers](third_party_offers.md) - [Third party offers](third_party_offers.md)
- [Usage statistics](usage_statistics.md) - [Usage statistics](usage_statistics.md)
- [Visibility and access controls](visibility_and_access_controls.md) - [Visibility and access controls](visibility_and_access_controls.md)
- [Custom templates repository](instance_template_repository.md) - [Custom templates repository](instance_template_repository.md) **[PREMIUM]**
NOTE: **Note:** NOTE: **Note:**
You can change the [first day of the week](../../profile/preferences.md) for the entire GitLab instance You can change the [first day of the week](../../profile/preferences.md) for the entire GitLab instance
......
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