diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-09 00:07:40 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-09 00:07:40 +0000 |
| commit | e8793358645d6c84b46ef56dafcbf834f20d6415 (patch) | |
| tree | c1c90c19c86b312a7def8dbdd2ddd8888b696d70 /doc/user/admin_area | |
| parent | e0b84f4ba4b44c8ecf00be97843c40df2550b74c (diff) | |
| download | gitlab-ce-e8793358645d6c84b46ef56dafcbf834f20d6415.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/admin_area')
33 files changed, 43 insertions, 42 deletions
diff --git a/doc/user/admin_area/custom_project_templates.md b/doc/user/admin_area/custom_project_templates.md index 8a0cc95ade0..f9a4dad2500 100644 --- a/doc/user/admin_area/custom_project_templates.md +++ b/doc/user/admin_area/custom_project_templates.md @@ -28,7 +28,7 @@ see [Custom group-level project templates](../group/custom_project_templates.md) GitLab administrators can configure a GitLab group that serves as template source for an entire GitLab instance by: -1. Navigating to **Admin area > Settings > Templates**. +1. Navigating to **Admin Area > Settings > Templates**. 1. Expanding **Custom project templates**. 1. Selecting a group to use. 1. Pressing **Save changes**. diff --git a/doc/user/admin_area/diff_limits.md b/doc/user/admin_area/diff_limits.md index 4e24c25de8f..bc6f93891df 100644 --- a/doc/user/admin_area/diff_limits.md +++ b/doc/user/admin_area/diff_limits.md @@ -24,7 +24,7 @@ CAUTION: **Caution:** This setting is experimental. An increased maximum will increase resource consumption of your instance. Keep this in mind when adjusting the maximum. -1. Go to **Admin area > Settings > General**. +1. Go to **Admin Area > Settings > General**. 1. Expand **Diff limits**. 1. Enter a value for **Maximum diff patch size**, measured in bytes. 1. Click on **Save changes**. diff --git a/doc/user/admin_area/geo_nodes.md b/doc/user/admin_area/geo_nodes.md index bbdb9cb07a6..250956beb63 100644 --- a/doc/user/admin_area/geo_nodes.md +++ b/doc/user/admin_area/geo_nodes.md @@ -2,12 +2,12 @@ type: howto --- -# Geo nodes admin area **(PREMIUM ONLY)** +# Geo nodes Admin Area **(PREMIUM ONLY)** You can configure various settings for GitLab Geo nodes. For more information, see [Geo documentation](../../administration/geo/replication/index.md). -On the primary node, go to **Admin area > Geo**. On secondary nodes, go to **Admin area > Geo > Nodes**. +On the primary node, go to **Admin Area > Geo**. On secondary nodes, go to **Admin Area > Geo > Nodes**. ## Common settings @@ -59,7 +59,7 @@ The **primary** node's Internal URL is used by **secondary** nodes to contact it which is used by users. Internal URL does not need to be a private address. Internal URL defaults to External URL, but you can customize it under -**Admin area > Geo Nodes**. +**Admin Area > Geo > Nodes**. CAUTION: **Warning:** We recommend using an HTTPS connection while configuring the Geo nodes. To avoid diff --git a/doc/user/admin_area/img/appearance_favicon_v12_3.png b/doc/user/admin_area/img/appearance_favicon_v12_3.png Binary files differindex b464c9087e9..0bab0638265 100644 --- a/doc/user/admin_area/img/appearance_favicon_v12_3.png +++ b/doc/user/admin_area/img/appearance_favicon_v12_3.png diff --git a/doc/user/admin_area/img/appearance_header_footer_v12_3.png b/doc/user/admin_area/img/appearance_header_footer_v12_3.png Binary files differindex aed0ff820fb..da68ddcf166 100644 --- a/doc/user/admin_area/img/appearance_header_footer_v12_3.png +++ b/doc/user/admin_area/img/appearance_header_footer_v12_3.png diff --git a/doc/user/admin_area/img/appearance_header_logo_v12_3.png b/doc/user/admin_area/img/appearance_header_logo_v12_3.png Binary files differindex 0da56d196c0..414301b8efa 100644 --- a/doc/user/admin_area/img/appearance_header_logo_v12_3.png +++ b/doc/user/admin_area/img/appearance_header_logo_v12_3.png diff --git a/doc/user/admin_area/img/appearance_new_project_preview_v12_3.png b/doc/user/admin_area/img/appearance_new_project_preview_v12_3.png Binary files differindex 621e62e787b..92593399843 100644 --- a/doc/user/admin_area/img/appearance_new_project_preview_v12_3.png +++ b/doc/user/admin_area/img/appearance_new_project_preview_v12_3.png diff --git a/doc/user/admin_area/img/appearance_new_project_v12_3.png b/doc/user/admin_area/img/appearance_new_project_v12_3.png Binary files differindex ae1a8ca0f85..120a191de27 100644 --- a/doc/user/admin_area/img/appearance_new_project_v12_3.png +++ b/doc/user/admin_area/img/appearance_new_project_v12_3.png diff --git a/doc/user/admin_area/img/appearance_sign_in_preview_v12_3.png b/doc/user/admin_area/img/appearance_sign_in_preview_v12_3.png Binary files differindex 64bd62c2d32..59c190393d1 100644 --- a/doc/user/admin_area/img/appearance_sign_in_preview_v12_3.png +++ b/doc/user/admin_area/img/appearance_sign_in_preview_v12_3.png diff --git a/doc/user/admin_area/img/appearance_sign_in_v12_3.png b/doc/user/admin_area/img/appearance_sign_in_v12_3.png Binary files differindex 6abe10f8bea..7e2337bbae8 100644 --- a/doc/user/admin_area/img/appearance_sign_in_v12_3.png +++ b/doc/user/admin_area/img/appearance_sign_in_v12_3.png diff --git a/doc/user/admin_area/img/credentials_inventory_v12_6.png b/doc/user/admin_area/img/credentials_inventory_v12_6.png Binary files differindex ff46db61cdb..5c16781cb2d 100644 --- a/doc/user/admin_area/img/credentials_inventory_v12_6.png +++ b/doc/user/admin_area/img/credentials_inventory_v12_6.png diff --git a/doc/user/admin_area/img/minimum_password_length_settings_v12_6.png b/doc/user/admin_area/img/minimum_password_length_settings_v12_6.png Binary files differindex f75d9e9bb29..27634a02a8a 100644 --- a/doc/user/admin_area/img/minimum_password_length_settings_v12_6.png +++ b/doc/user/admin_area/img/minimum_password_length_settings_v12_6.png diff --git a/doc/user/admin_area/license.md b/doc/user/admin_area/license.md index fe8903a9f01..c9d8a457a51 100644 --- a/doc/user/admin_area/license.md +++ b/doc/user/admin_area/license.md @@ -24,17 +24,17 @@ will be locked. The very first time you visit your GitLab EE installation signed in as an admin, you should see a note urging you to upload a license with a link that takes you -straight to the License admin area. +straight to **Admin Area > License**. Otherwise, you can: 1. Navigate manually to the **Admin Area** by clicking the wrench icon in the menu bar. -  +  1. And then going to the **License** tab and click on **Upload New License**. -  +  1. If you've received a `.gitlab-license` file, you should have already downloaded it in your local machine. You can then upload it directly by choosing the @@ -69,7 +69,7 @@ gitlab_rails['license_file'] = "/path/to/license/file" CAUTION: **Caution:** These methods will only add a license at the time of installation. Use the -admin area in the web ui to renew or upgrade licenses. +Admin Area in the web ui to renew or upgrade licenses. --- diff --git a/doc/user/admin_area/monitoring/health_check.md b/doc/user/admin_area/monitoring/health_check.md index 68767efc72a..dbcd737e477 100644 --- a/doc/user/admin_area/monitoring/health_check.md +++ b/doc/user/admin_area/monitoring/health_check.md @@ -141,7 +141,7 @@ This check is being exempt from Rack Attack. > Access token has been deprecated in GitLab 9.4 in favor of [IP whitelist](#ip-whitelist). An access token needs to be provided while accessing the probe endpoints. The current -accepted token can be found under the **Admin area ➔ Monitoring ➔ Health check** +accepted token can be found under the **Admin Area ➔ Monitoring ➔ Health check** (`admin/health_check`) page of your GitLab instance.  diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md index f6b7da384bc..8f8af0d7481 100644 --- a/doc/user/admin_area/settings/continuous_integration.md +++ b/doc/user/admin_area/settings/continuous_integration.md @@ -5,16 +5,16 @@ type: reference # Continuous Integration and Deployment Admin settings **(CORE ONLY)** In this area, you will find settings for Auto DevOps, Runners and job artifacts. -You can find it in the admin area, under **Settings > Continuous Integration and Deployment**. +You can find it in the **Admin Area > Settings > CI/CD**. - + ## Auto DevOps **(CORE ONLY)** To enable (or disable) [Auto DevOps](../../../topics/autodevops/index.md) for all projects: -1. Go to **Admin area > Settings > Continuous Integration and Deployment** +1. Go to **Admin Area > Settings > CI/CD** 1. Check (or uncheck to disable) the box that says "Default to Auto DevOps pipeline for all projects" 1. Optionally, set up the [Auto DevOps base domain](../../../topics/autodevops/index.md#auto-devops-base-domain) which is going to be used for Auto Deploy and Auto Review Apps. @@ -43,7 +43,7 @@ To change it at the: - Instance level: - 1. Go to **Admin area > Settings > Continuous Integration and Deployment**. + 1. Go to **Admin Area > Settings > CI/CD**. 1. Change the value of maximum artifacts size (in MB). 1. Hit **Save changes** for the changes to take effect. @@ -65,12 +65,12 @@ The setting at all levels is only available to GitLab administrators. ## Default artifacts expiration **(CORE ONLY)** The default expiration time of the [job artifacts](../../../administration/job_artifacts.md) -can be set in the Admin area of your GitLab instance. The syntax of duration is +can be set in the Admin Area of your GitLab instance. The syntax of duration is described in [`artifacts:expire_in`](../../../ci/yaml/README.md#artifactsexpire_in) and the default value is `30 days`. On GitLab.com they [never expire](../../gitlab_com/index.md#gitlab-cicd). -1. Go to **Admin area > Settings > Continuous Integration and Deployment**. +1. Go to **Admin Area > Settings > CI/CD**. 1. Change the value of default expiration time. 1. Hit **Save changes** for the changes to take effect. @@ -99,17 +99,17 @@ On GitLab.com, the quota is calculated based on your To change the pipelines minutes quota: -1. Go to **Admin area > Settings > Continuous Integration and Deployment** +1. Go to **Admin Area > Settings > CI/CD** 1. Set the pipeline minutes quota limit. 1. Hit **Save changes** for the changes to take effect --- -While the setting in the Admin area has a global effect, as an admin you can +While the setting in the Admin Area has a global effect, as an admin you can also change each group's pipeline minutes quota to override the global value. -1. Navigate to the **Groups** admin area and hit the **Edit** button for the - group you wish to change the pipeline minutes quota. +1. Navigate to the **Admin Area > Overview > Groups** and hit the **Edit** + button for the group you wish to change the pipeline minutes quota. 1. Set the pipeline minutes quota to the desired value 1. Hit **Save changes** for the changes to take effect. @@ -132,8 +132,9 @@ but persisting the traces and artifacts for auditing purposes. To set the duration for which the jobs will be considered as old and expired: -1. Go to **Admin area > Settings > CI/CD > Continuous Integration and Deployment**. -1. Change the value of "Archive jobs". +1. Go to **Admin Area > Settings > CI/CD**. +1. Expand the **Continuous Integration and Deployment** section. +1. Set the value of **Archive jobs**. 1. Hit **Save changes** for the changes to take effect. Once that time passes, the jobs will be archived and no longer able to be @@ -145,9 +146,9 @@ for example: <code>15 days</code>, <code>1 month</code>, <code>2 years</code>. > [Introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/18073) in GitLab 12.5. The default CI configuration file path for new projects can be set in the Admin -area of your GitLab instance (`.gitlab-ci.yml` if not set): +Area of your GitLab instance (`.gitlab-ci.yml` if not set): -1. Go to **Admin area > Settings > Continuous Integration and Deployment**. +1. Go to **Admin Area > Settings > CI/CD**. 1. Input the new path in the **Default CI configuration path** field. 1. Hit **Save changes** for the changes to take effect. @@ -183,7 +184,7 @@ sourced from: To set required pipeline configuration: -1. Go to **Admin area > Settings > CI/CD**. +1. Go to **Admin Area > Settings > CI/CD**. 1. Expand the **Required pipeline configuration** section. 1. Select the required configuration from the provided dropdown. 1. Click **Save changes**. diff --git a/doc/user/admin_area/settings/external_authorization.md b/doc/user/admin_area/settings/external_authorization.md index d11f672ca5c..5a7300f2b46 100644 --- a/doc/user/admin_area/settings/external_authorization.md +++ b/doc/user/admin_area/settings/external_authorization.md @@ -40,7 +40,7 @@ Read more about logs GitLab keeps in the [omnibus documentation][omnibus-log-doc ## Configuration The external authorization service can be enabled by an admin on the GitLab's -admin area under the settings page: +**Admin Area > Settings > General** page:  diff --git a/doc/user/admin_area/settings/help_page.md b/doc/user/admin_area/settings/help_page.md index a2c99f94d8b..ca983edd4fa 100644 --- a/doc/user/admin_area/settings/help_page.md +++ b/doc/user/admin_area/settings/help_page.md @@ -13,7 +13,7 @@ to go for help. You can customize and display this information on the GitLab ser You can add a help message, which will be shown on the GitLab `/help` page (e.g., <https://gitlab.com/help>) in a new section at the top of the `/help` page: -1. Navigate to **Admin area > Settings > Preferences**, then expand **Help page**. +1. Navigate to **Admin Area > Settings > Preferences**, then expand **Help page**. 1. Under **Help page text**, fill in the information you wish to display on `/help`.  @@ -27,7 +27,7 @@ You can add a help message, which will be shown on the GitLab `/help` page (e.g. You can add a help message, which will be shown on the GitLab login page in a new section titled `Need Help?`, located below the login page message: -1. Navigate to **Admin area > Settings > Preferences**, then expand **Help page**. +1. Navigate to **Admin Area > Settings > Preferences**, then expand **Help page**. 1. Under **Help text**, fill in the information you wish to display on the login page.  diff --git a/doc/user/admin_area/settings/img/bulk_push_event_v12_4.png b/doc/user/admin_area/settings/img/bulk_push_event_v12_4.png Binary files differindex 38e666e32ac..114e87a61f1 100644 --- a/doc/user/admin_area/settings/img/bulk_push_event_v12_4.png +++ b/doc/user/admin_area/settings/img/bulk_push_event_v12_4.png diff --git a/doc/user/admin_area/settings/img/clone_panel_v12_4.png b/doc/user/admin_area/settings/img/clone_panel_v12_4.png Binary files differindex 8aa0bd2f7d8..427224f5b78 100644 --- a/doc/user/admin_area/settings/img/clone_panel_v12_4.png +++ b/doc/user/admin_area/settings/img/clone_panel_v12_4.png diff --git a/doc/user/admin_area/settings/img/disable_signup_v12_7.png b/doc/user/admin_area/settings/img/disable_signup_v12_7.png Binary files differindex 278d6e84e26..be1a070a804 100644 --- a/doc/user/admin_area/settings/img/disable_signup_v12_7.png +++ b/doc/user/admin_area/settings/img/disable_signup_v12_7.png diff --git a/doc/user/admin_area/settings/img/email_confirmation_v12_7.png b/doc/user/admin_area/settings/img/email_confirmation_v12_7.png Binary files differindex 22004fb98ef..6bcadb63b9a 100644 --- a/doc/user/admin_area/settings/img/email_confirmation_v12_7.png +++ b/doc/user/admin_area/settings/img/email_confirmation_v12_7.png diff --git a/doc/user/admin_area/settings/img/help_page_help_page_text_ex_v12_3.png b/doc/user/admin_area/settings/img/help_page_help_page_text_ex_v12_3.png Binary files differindex 9dc7ef28149..421fa2977f9 100644 --- a/doc/user/admin_area/settings/img/help_page_help_page_text_ex_v12_3.png +++ b/doc/user/admin_area/settings/img/help_page_help_page_text_ex_v12_3.png diff --git a/doc/user/admin_area/settings/img/help_page_help_page_text_v12_3.png b/doc/user/admin_area/settings/img/help_page_help_page_text_v12_3.png Binary files differindex 59d3343db34..13c17fb118a 100644 --- a/doc/user/admin_area/settings/img/help_page_help_page_text_v12_3.png +++ b/doc/user/admin_area/settings/img/help_page_help_page_text_v12_3.png diff --git a/doc/user/admin_area/settings/img/help_page_help_text_ex_v12_3.png b/doc/user/admin_area/settings/img/help_page_help_text_ex_v12_3.png Binary files differindex 9de26ac0758..973be2e8b6e 100644 --- a/doc/user/admin_area/settings/img/help_page_help_text_ex_v12_3.png +++ b/doc/user/admin_area/settings/img/help_page_help_text_ex_v12_3.png diff --git a/doc/user/admin_area/settings/img/help_page_help_text_v12_3.png b/doc/user/admin_area/settings/img/help_page_help_text_v12_3.png Binary files differindex 1b6aad5753a..8848ea55cf3 100644 --- a/doc/user/admin_area/settings/img/help_page_help_text_v12_3.png +++ b/doc/user/admin_area/settings/img/help_page_help_text_v12_3.png diff --git a/doc/user/admin_area/settings/img/protected_paths.png b/doc/user/admin_area/settings/img/protected_paths.png Binary files differindex 7aa9124b845..2233a71a139 100644 --- a/doc/user/admin_area/settings/img/protected_paths.png +++ b/doc/user/admin_area/settings/img/protected_paths.png diff --git a/doc/user/admin_area/settings/img/push_event_activities_limit_v12_4.png b/doc/user/admin_area/settings/img/push_event_activities_limit_v12_4.png Binary files differindex fd3775ac4d7..ea618ad4c50 100644 --- a/doc/user/admin_area/settings/img/push_event_activities_limit_v12_4.png +++ b/doc/user/admin_area/settings/img/push_event_activities_limit_v12_4.png diff --git a/doc/user/admin_area/settings/img/rate_limits_on_raw_endpoints.png b/doc/user/admin_area/settings/img/rate_limits_on_raw_endpoints.png Binary files differindex c32eb93c8a8..c59f67df1ce 100644 --- a/doc/user/admin_area/settings/img/rate_limits_on_raw_endpoints.png +++ b/doc/user/admin_area/settings/img/rate_limits_on_raw_endpoints.png diff --git a/doc/user/admin_area/settings/index.md b/doc/user/admin_area/settings/index.md index 42f496bfbfa..07d614b449b 100644 --- a/doc/user/admin_area/settings/index.md +++ b/doc/user/admin_area/settings/index.md @@ -27,9 +27,9 @@ include: NOTE: **Note:** You can change the [first day of the week](../../profile/preferences.md) for the entire GitLab instance -in the **Localization** section of **Admin area > Settings > Preferences**. +in the **Localization** section of **Admin Area > Settings > Preferences**. -## GitLab.com admin area settings +## GitLab.com Admin Area settings Most of the settings under the Admin Area change the behavior of the whole GitLab instance. For GitLab.com, the admin settings are available only for the diff --git a/doc/user/admin_area/settings/instance_template_repository.md b/doc/user/admin_area/settings/instance_template_repository.md index b3a861cac45..1338352fcb1 100644 --- a/doc/user/admin_area/settings/instance_template_repository.md +++ b/doc/user/admin_area/settings/instance_template_repository.md @@ -17,10 +17,10 @@ while the project remains secure. ## Configuration -As an administrator, navigate to **Admin area > Settings > Templates** and +As an administrator, navigate to **Admin Area > Settings > Templates** and select the project to serve as the custom template repository. - + Once a project has been selected, you can add custom templates to the repository, and they will appear in the appropriate places in the diff --git a/doc/user/admin_area/settings/sign_in_restrictions.md b/doc/user/admin_area/settings/sign_in_restrictions.md index 0975766400f..1da93c7005f 100644 --- a/doc/user/admin_area/settings/sign_in_restrictions.md +++ b/doc/user/admin_area/settings/sign_in_restrictions.md @@ -40,7 +40,7 @@ this message after logging-in. To access this feature: -1. Navigate to the **Settings > General** in the Admin area. +1. Navigate to the **Admin Area > Settings > General**. 1. Expand the **Sign-in restrictions** section. <!-- ## Troubleshooting diff --git a/doc/user/admin_area/settings/sign_up_restrictions.md b/doc/user/admin_area/settings/sign_up_restrictions.md index 80d5dae4a82..0686044b9e3 100644 --- a/doc/user/admin_area/settings/sign_up_restrictions.md +++ b/doc/user/admin_area/settings/sign_up_restrictions.md @@ -68,7 +68,7 @@ addresses. To access this feature: -1. Navigate to the **Settings > General** in the Admin area. +1. Navigate to the **Admin Area > Settings > General**. 1. Expand the **Sign-up restrictions** section. For the blacklist, you can enter the list manually or upload a `.txt` file that diff --git a/doc/user/admin_area/settings/usage_statistics.md b/doc/user/admin_area/settings/usage_statistics.md index 666e6c8d7ad..eae6925d073 100644 --- a/doc/user/admin_area/settings/usage_statistics.md +++ b/doc/user/admin_area/settings/usage_statistics.md @@ -7,8 +7,8 @@ type: reference GitLab Inc. will periodically collect information about your instance in order to perform various actions. -All statistics are opt-out, you can enable/disable them from the admin panel -under **Admin area > Settings > Metrics and profiling > Usage statistics**. +All statistics are opt-out. You can enable/disable them in the +**Admin Area > Settings > Metrics and profiling** section **Usage statistics**. ## Version Check **(CORE ONLY)** @@ -31,7 +31,7 @@ patches will need to be backported, making sure active GitLab instances remain secure. If you disable version check, this information will not be collected. Enable or -disable the version check at **Admin area > Settings > Metrics and profiling > Usage statistics**. +disable the version check in **Admin Area > Settings > Metrics and profiling > Usage statistics**. ### Request flow example @@ -64,9 +64,9 @@ of the instance. You can view the exact JSON payload in the administration panel. To view the payload: -1. Go to the **Admin area** (spanner symbol on the top bar). -1. Expand **Settings** in the left sidebar and click on **Metrics and profiling**. -1. Expand **Usage statistics** and click on the **Preview payload** button. +1. Navigate to the **Admin Area > Settings > Metrics and profiling**. +1. Expand the **Usage statistics** section. +1. Click the **Preview payload** button. You can see how [the usage ping data maps to different stages of the product](https://gitlab.com/gitlab-data/analytics/blob/master/transform/snowflake-dbt/data/version_usage_stats_to_stage_mappings.csv). @@ -125,8 +125,8 @@ Once usage ping is enabled, GitLab will gather data from other instances and will be able to show [usage statistics](../../instance_statistics/index.md) of your instance to your users. -This can be restricted to admins by selecting "Only admins" in the Instance -Statistics visibility section under **Admin area > Settings > Metrics and profiling > Usage statistics**. +To make this visible only to admins, go to **Admin Area > Settings > Metrics and profiling**, expand +**Usage statistics**, and set the **Instance Statistics visibility** option to **Only admins**. <!-- ## Troubleshooting |
