From e8793358645d6c84b46ef56dafcbf834f20d6415 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 9 Jan 2020 00:07:40 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/qa.gitlab-ci.yml | 4 +-- .gitlab/ci/review.gitlab-ci.yml | 4 +-- app/services/clusters/aws/provision_service.rb | 3 +- ...ter-results-in-error-unknown-keyword-region.yml | 5 ++++ doc/administration/auditor_users.md | 6 ++-- doc/administration/auth/ldap-ee.md | 2 +- doc/administration/auth/ldap.md | 2 +- .../replication/img/adding_a_secondary_node.png | Bin 87593 -> 23555 bytes .../img/single_git_add_geolocation_rule.png | Bin 76035 -> 20674 bytes .../single_git_add_traffic_policy_endpoints.png | Bin 88896 -> 24704 bytes .../geo/replication/img/single_git_clone_panel.png | Bin 20007 -> 6771 bytes ...t_create_policy_records_with_traffic_policy.png | Bin 102350 -> 32032 bytes .../img/single_git_created_policy_record.png | Bin 141505 -> 49183 bytes .../geo/replication/img/single_git_name_policy.png | Bin 37964 -> 12018 bytes .../replication/img/single_git_policy_diagram.png | Bin 56194 -> 13683 bytes .../img/single_git_traffic_policies.png | Bin 214666 -> 74793 bytes .../geo/replication/troubleshooting.md | 4 +-- .../gitaly/img/architecture_v12_4.png | Bin 88598 -> 42885 bytes .../img/repository_storages_admin_ui.png | Bin 33219 -> 20897 bytes doc/administration/integration/terminal.md | 2 +- doc/administration/job_artifacts.md | 2 +- .../performance/grafana_configuration.md | 6 ++-- .../monitoring/performance/img/performance_bar.png | Bin 73762 -> 21503 bytes .../performance/img/performance_bar_frontend.png | Bin 362077 -> 112089 bytes .../img/performance_bar_gitaly_threshold.png | Bin 65296 -> 19076 bytes .../performance_bar_request_selector_warning.png | Bin 58287 -> 17259 bytes ...mance_bar_request_selector_warning_expanded.png | Bin 62514 -> 19758 bytes .../monitoring/performance/performance_bar.md | 5 ++-- .../monitoring/prometheus/gitlab_metrics.md | 4 +-- .../operations/extra_sidekiq_processes.md | 4 +-- doc/administration/pages/index.md | 8 +++--- doc/administration/pages/source.md | 4 +-- doc/administration/repository_storage_paths.md | 2 +- doc/api/settings.md | 2 +- doc/api/system_hooks.md | 2 +- doc/ci/img/pipeline-delete.png | Bin 35251 -> 9658 bytes .../img/merged_result_pipeline_v12_3.png | Bin 28194 -> 7734 bytes doc/ci/runners/README.md | 6 ++-- .../img/inherited_group_variables_v12_5.png | Bin 73965 -> 21349 bytes .../documentation/site_architecture/global_nav.md | 2 +- doc/development/event_tracking/index.md | 2 +- .../fe_guide/img/graphiql_explorer_v12_4.png | Bin 353541 -> 106368 bytes doc/development/img/build_package_v12_6.png | Bin 124510 -> 39482 bytes .../img/memory_ruby_heap_fragmentation.png | Bin 195892 -> 60230 bytes .../img/trigger_build_package_v12_6.png | Bin 141603 -> 44149 bytes doc/development/testing_guide/img/k9s.png | Bin 364038 -> 117900 bytes doc/integration/elasticsearch.md | 4 +-- .../img/authorize_vault_with_gitlab_v12_6.png | Bin 197922 -> 94836 bytes doc/integration/img/gitlab_oauth_vault_v12_6.png | Bin 133594 -> 45162 bytes .../img/sign_into_vault_with_gitlab_v12_6.png | Bin 87168 -> 23563 bytes .../img/signed_into_vault_via_oidc_v12_6.png | Bin 106942 -> 29156 bytes doc/integration/img/sourcegraph_admin_v12_5.png | Bin 61520 -> 18499 bytes doc/integration/img/sourcegraph_demo_v12_5.png | Bin 97025 -> 28210 bytes doc/integration/img/sourcegraph_popover_v12_5.png | Bin 27925 -> 8647 bytes .../img/sourcegraph_user_preferences_v12_5.png | Bin 37710 -> 11164 bytes doc/integration/oauth_provider.md | 8 +++--- .../img/project_visibility_confirmation_v12_6.png | Bin 101511 -> 33696 bytes doc/push_rules/push_rules.md | 4 +-- doc/security/password_length_limits.md | 2 +- doc/security/ssh_keys_restrictions.md | 4 +-- doc/security/two_factor_authentication.md | 2 +- doc/security/user_email_confirmation.md | 2 +- doc/security/webhooks.md | 3 +- doc/ssh/README.md | 2 +- doc/tools/email.md | 6 ++-- .../autodevops/img/autodevops_banner_v12_6.png | Bin 78142 -> 24252 bytes .../autodevops/img/guide_base_domain_v12_3.png | Bin 154544 -> 42811 bytes .../autodevops/img/guide_cluster_apps_v12_3.png | Bin 450677 -> 166526 bytes .../autodevops/img/guide_create_project_v12_3.png | Bin 168562 -> 47644 bytes .../img/guide_enable_autodevops_v12_3.png | Bin 166170 -> 49125 bytes .../img/guide_environments_metrics_v12_3.png | Bin 228405 -> 60723 bytes .../autodevops/img/guide_environments_v12_3.png | Bin 98954 -> 26181 bytes .../autodevops/img/guide_first_pipeline_v12_3.png | Bin 98803 -> 27345 bytes .../img/guide_gitlab_gke_details_v12_3.png | Bin 366714 -> 105931 bytes .../autodevops/img/guide_google_signin_v12_3.png | Bin 139458 -> 43412 bytes .../autodevops/img/guide_ide_commit_v12_3.png | Bin 217543 -> 58686 bytes .../img/guide_merge_request_review_app_v12_3.png | Bin 271933 -> 74324 bytes .../autodevops/img/guide_merge_request_v12_3.png | Bin 312053 -> 82031 bytes .../autodevops/img/guide_pipeline_stages_v12_3.png | Bin 135200 -> 40329 bytes .../img/guide_project_landing_page_v12_3.png | Bin 236893 -> 67451 bytes .../img/guide_project_template_v12_3.png | Bin 170031 -> 46440 bytes doc/topics/autodevops/index.md | 4 +-- doc/user/admin_area/custom_project_templates.md | 2 +- doc/user/admin_area/diff_limits.md | 2 +- doc/user/admin_area/geo_nodes.md | 6 ++-- .../admin_area/img/appearance_favicon_v12_3.png | Bin 234009 -> 63960 bytes .../img/appearance_header_footer_v12_3.png | Bin 240647 -> 75368 bytes .../img/appearance_header_logo_v12_3.png | Bin 168033 -> 45793 bytes .../img/appearance_new_project_preview_v12_3.png | Bin 475996 -> 140231 bytes .../img/appearance_new_project_v12_3.png | Bin 221407 -> 62219 bytes .../img/appearance_sign_in_preview_v12_3.png | Bin 1053743 -> 330692 bytes .../admin_area/img/appearance_sign_in_v12_3.png | Bin 857575 -> 275303 bytes .../admin_area/img/credentials_inventory_v12_6.png | Bin 164125 -> 52974 bytes .../img/minimum_password_length_settings_v12_6.png | Bin 29714 -> 10385 bytes doc/user/admin_area/license.md | 8 +++--- doc/user/admin_area/monitoring/health_check.md | 2 +- .../admin_area/settings/continuous_integration.md | 31 +++++++++++---------- .../admin_area/settings/external_authorization.md | 2 +- doc/user/admin_area/settings/help_page.md | 4 +-- .../settings/img/bulk_push_event_v12_4.png | Bin 28215 -> 9386 bytes .../admin_area/settings/img/clone_panel_v12_4.png | Bin 20007 -> 6771 bytes .../settings/img/disable_signup_v12_7.png | Bin 20061 -> 7928 bytes .../settings/img/email_confirmation_v12_7.png | Bin 24681 -> 9837 bytes .../img/help_page_help_page_text_ex_v12_3.png | Bin 303088 -> 88817 bytes .../img/help_page_help_page_text_v12_3.png | Bin 90930 -> 23707 bytes .../settings/img/help_page_help_text_ex_v12_3.png | Bin 150716 -> 48882 bytes .../settings/img/help_page_help_text_v12_3.png | Bin 68525 -> 19190 bytes .../admin_area/settings/img/protected_paths.png | Bin 198802 -> 56448 bytes .../img/push_event_activities_limit_v12_4.png | Bin 46607 -> 15739 bytes .../settings/img/rate_limits_on_raw_endpoints.png | Bin 58254 -> 20962 bytes doc/user/admin_area/settings/index.md | 4 +-- .../settings/instance_template_repository.md | 4 +-- .../admin_area/settings/sign_in_restrictions.md | 2 +- .../admin_area/settings/sign_up_restrictions.md | 2 +- doc/user/admin_area/settings/usage_statistics.md | 16 +++++------ .../dependency_list/img/dependency_list_v12_3.png | Bin 622199 -> 156081 bytes ...d-settings-cluster-management-project-v12_5.png | Bin 66251 -> 37271 bytes .../img/cluster_environments_table_v12_3.png | Bin 126230 -> 41771 bytes doc/user/discussions/img/make_suggestion.png | Bin 115084 -> 31897 bytes doc/user/discussions/img/suggestion.png | Bin 149758 -> 44493 bytes doc/user/group/epics/img/epics_list_view_v12.5.png | Bin 442541 -> 116123 bytes doc/user/group/img/select_group_dropdown.png | Bin 74893 -> 64359 bytes .../subgroups/img/group_members_filter_v12_6.png | Bin 19894 -> 6381 bytes .../img/incident_management_settings.png | Bin 45533 -> 14916 bytes doc/user/instance_statistics/img/cohorts.png | Bin 202569 -> 65996 bytes .../img/dev_ops_score_v12_6.png | Bin 678055 -> 199953 bytes .../img/instance_statistics_button_v12_6.png | Bin 15183 -> 4417 bytes doc/user/instance_statistics/index.md | 2 +- .../conan_repository/img/conan_package_view.png | Bin 178189 -> 46391 bytes .../img/group_dependency_proxy.png | Bin 219661 -> 58663 bytes doc/user/permissions.md | 4 +-- doc/user/profile/account/create_accounts.md | 2 +- doc/user/profile/account/img/admin_user_button.png | Bin 84870 -> 31006 bytes doc/user/profile/account/img/admin_user_form.png | Bin 196691 -> 67281 bytes doc/user/profile/account/img/register_tab.png | Bin 205561 -> 69998 bytes ..._owners_approval_new_protected_branch_v12_4.png | Bin 141341 -> 41386 bytes .../img/description_templates_issue_settings.png | Bin 34698 -> 11103 bytes ...escription_templates_merge_request_settings.png | Bin 144128 -> 49367 bytes doc/user/project/img/issue_boards_multi_select.png | Bin 21091 -> 6205 bytes .../project/img/protected_branches_list_v12_3.png | Bin 32351 -> 10208 bytes .../project/img/protected_branches_page_v12_3.png | Bin 50657 -> 16336 bytes doc/user/project/img/service_desk_enabled.png | Bin 51597 -> 19003 bytes doc/user/project/img/service_desk_nav_item.png | Bin 19103 -> 5158 bytes .../img/bitbucket_import_select_project_v12_3.png | Bin 112397 -> 31980 bytes ...itbucket_server_import_select_project_v12_3.png | Bin 47059 -> 15839 bytes .../import/img/gitlab_new_project_page_v12_2.png | Bin 214213 -> 66644 bytes .../import_projects_from_gitea_importer_v12_3.png | Bin 50650 -> 15680 bytes .../import_projects_from_github_importer_v12_3.png | Bin 53497 -> 17532 bytes .../import/img/import_projects_from_repo_url.png | Bin 142284 -> 50149 bytes doc/user/project/import/phabricator.md | 2 +- .../integrations/img/emails_on_push_service.png | Bin 225695 -> 81786 bytes .../img/embed_metrics_issue_template.png | Bin 146220 -> 43908 bytes .../img/hangouts_chat_configuration.png | Bin 71131 -> 29513 bytes .../integrations/img/mattermost_configuration.png | Bin 114026 -> 44878 bytes .../img/microsoft_teams_configuration.png | Bin 71585 -> 29336 bytes .../integrations/img/slack_configuration.png | Bin 103375 -> 41458 bytes .../img/unify_circuit_configuration.png | Bin 274416 -> 85910 bytes .../project/integrations/services_templates.md | 4 +-- .../issues/img/confirm_design_deletion_v12_4.png | Bin 760814 -> 301886 bytes .../issues/img/delete_multiple_designs_v12_4.png | Bin 1330499 -> 363274 bytes .../issues/img/delete_single_design_v12_4.png | Bin 2834774 -> 921627 bytes .../issues/img/disable_issue_auto_close.png | Bin 48055 -> 15119 bytes .../project/issues/img/select_designs_v12_4.png | Bin 1324080 -> 365232 bytes .../project/issues/img/zoom-quickaction-button.png | Bin 53418 -> 43369 bytes doc/user/project/members/img/project_members.png | Bin 108736 -> 36955 bytes .../members/img/project_members_filter_v12_6.png | Bin 19894 -> 6381 bytes .../img/create_merge_request_button_v12_6.png | Bin 33280 -> 9428 bytes .../img/dependencies_edit_inaccessible_v12_4.png | Bin 55947 -> 19518 bytes .../merge_requests/img/dependencies_edit_v12_4.png | Bin 53561 -> 18741 bytes .../merge_requests/img/dependencies_view_v12_2.png | Bin 37528 -> 13579 bytes ...rementally_expand_merge_request_diffs_v12_2.png | Bin 96982 -> 28918 bytes .../img/merge_request_diff_v12_2.png | Bin 136144 -> 60405 bytes .../img/new_merge_request_page_v12_6.png | Bin 289963 -> 81875 bytes .../project/operations/img/error_details_v12_5.png | Bin 522760 -> 148683 bytes .../project/operations/img/error_details_v12_6.png | Bin 151389 -> 47553 bytes .../img/custom_notifications_dropdown_v12_5.png | Bin 30218 -> 14983 bytes .../img/custom_notifications_new_release_v12_5.png | Bin 46129 -> 20811 bytes .../releases/img/edit_release_page_v12_6.png | Bin 150927 -> 44412 bytes .../releases/img/release_edit_button_v12_6.png | Bin 87472 -> 25953 bytes .../repository/img/file_blame_button_v12_6.png | Bin 22175 -> 9194 bytes .../repository/img/file_blame_output_v12_6.png | Bin 96929 -> 33906 bytes .../img/file_blame_previous_commit_v12_7.png | Bin 105806 -> 31011 bytes .../repository/img/file_history_button_v12_6.png | Bin 22175 -> 9194 bytes .../repository/img/file_history_output_v12_6.png | Bin 84738 -> 29647 bytes .../img/repository_mirroring_push_settings.png | Bin 72515 -> 23955 bytes ...r_new_branch_from_issue_create_button_v12_6.png | Bin 70114 -> 19967 bytes .../web_editor_new_branch_from_issue_v_12_6.png | Bin 76938 -> 24507 bytes .../project/web_ide/img/commit_changes_v12_3.png | Bin 712873 -> 196689 bytes .../project/web_ide/img/review_changes_v12_3.png | Bin 660299 -> 179489 bytes doc/user/search/img/issue_search_filter_v12_7.png | Bin 186649 -> 64161 bytes lib/tasks/pngquant.rake | 2 +- locale/gitlab.pot | 3 ++ .../clusters/aws/provision_service_spec.rb | 2 +- 193 files changed, 118 insertions(+), 110 deletions(-) create mode 100644 changelogs/unreleased/121751-new-eks-cluster-results-in-error-unknown-keyword-region.yml diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index 0c7d2318009..5a58c3f9416 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -1,10 +1,10 @@ # Make sure to update all the similar conditions in other CI config files if you modify these conditions .if-canonical-gitlab-schedule: &if-canonical-gitlab-schedule - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/ && $CI_PIPELINE_SOURCE == "schedule"' + if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org" && $CI_PIPELINE_SOURCE == "schedule"' # Make sure to update all the similar conditions in other CI config files if you modify these conditions .if-canonical-gitlab-merge-request: &if-canonical-gitlab-merge-request - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/ && $CI_MERGE_REQUEST_IID' + if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org" && $CI_MERGE_REQUEST_IID' # Make sure to update all the similar patterns in other CI config files if you modify these patterns .code-patterns: &code-patterns diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index a42a927c6b9..ad045d6c974 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -1,10 +1,10 @@ # Make sure to update all the similar conditions in other CI config files if you modify these conditions .if-canonical-gitlab-schedule: &if-canonical-gitlab-schedule - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/ && $CI_PIPELINE_SOURCE == "schedule"' + if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org" && $CI_PIPELINE_SOURCE == "schedule"' # Make sure to update all the similar conditions in other CI config files if you modify these conditions .if-canonical-gitlab-merge-request: &if-canonical-gitlab-merge-request - if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org($|\/)/ && $CI_MERGE_REQUEST_IID' + if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org" && $CI_MERGE_REQUEST_IID' # Make sure to update all the similar patterns in other CI config files if you modify these patterns .code-qa-patterns: &code-qa-patterns diff --git a/app/services/clusters/aws/provision_service.rb b/app/services/clusters/aws/provision_service.rb index 35fe8433b4d..109e4c04a9c 100644 --- a/app/services/clusters/aws/provision_service.rb +++ b/app/services/clusters/aws/provision_service.rb @@ -38,8 +38,7 @@ module Clusters def credentials @credentials ||= Clusters::Aws::FetchCredentialsService.new( provision_role, - provider: provider, - region: provider.region + provider: provider ).execute end diff --git a/changelogs/unreleased/121751-new-eks-cluster-results-in-error-unknown-keyword-region.yml b/changelogs/unreleased/121751-new-eks-cluster-results-in-error-unknown-keyword-region.yml new file mode 100644 index 00000000000..09cd2f00fb5 --- /dev/null +++ b/changelogs/unreleased/121751-new-eks-cluster-results-in-error-unknown-keyword-region.yml @@ -0,0 +1,5 @@ +--- +title: Remove unused keyword from EKS provision service +merge_request: 22633 +author: +type: fixed diff --git a/doc/administration/auditor_users.md b/doc/administration/auditor_users.md index 9b4d0f443cf..46f8ae25916 100644 --- a/doc/administration/auditor_users.md +++ b/doc/administration/auditor_users.md @@ -9,7 +9,7 @@ resources on the GitLab instance. Auditor users can have full access to their own resources (projects, groups, snippets, etc.), and read-only access to **all** other resources, except the -Admin area. To put another way, they are just regular users (who can be added +Admin Area. To put another way, they are just regular users (who can be added to projects, create personal snippets, create milestones on their groups, etc.) who also happen to have read-only access to all projects on the system that they haven't been explicitly [given access][permissions] to. @@ -28,7 +28,7 @@ To sum up, assuming you have logged-in as an Auditor user: have the same access as the [permissions] they were given to. For example, if they were added as a Developer, they could then push commits or comment on issues. -- The Auditor cannot view the Admin area, or perform any admin actions. +- The Auditor cannot view the Admin Area, or perform any admin actions. For more information about what an Auditor can or can't do, see the [Permissions and restrictions of an Auditor user](#permissions-and-restrictions-of-an-auditor-user) @@ -73,7 +73,7 @@ instance, with the following permissions/restrictions: - Can read issues / MRs - Can read project snippets - Cannot be Admin and Auditor at the same time -- Cannot access the Admin area +- Cannot access the Admin Area - In a group / project they're not a member of: - Cannot access project settings - Cannot access group settings diff --git a/doc/administration/auth/ldap-ee.md b/doc/administration/auth/ldap-ee.md index 34fd97a24ee..a15e34c33a5 100644 --- a/doc/administration/auth/ldap-ee.md +++ b/doc/administration/auth/ldap-ee.md @@ -452,7 +452,7 @@ things to check to debug the situation. links by visiting the GitLab group, then **Settings dropdown > LDAP groups**. - Check that the user has an LDAP identity: 1. Sign in to GitLab as an administrator user. - 1. Navigate to **Admin area > Users**. + 1. Navigate to **Admin Area > Users**. 1. Search for the user 1. Open the user, by clicking on their name. Do not click 'Edit'. 1. Navigate to the **Identities** tab. There should be an LDAP identity with diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md index d449a5a72af..857f554f2fe 100644 --- a/doc/administration/auth/ldap.md +++ b/doc/administration/auth/ldap.md @@ -52,7 +52,7 @@ If a user is deleted from the LDAP server, they will be blocked in GitLab as well. Users will be immediately blocked from logging in. However, there is an LDAP check cache time of one hour (see note) which means users that are already logged in or are using Git over SSH will still be able to access -GitLab for up to one hour. Manually block the user in the GitLab Admin area to +GitLab for up to one hour. Manually block the user in the GitLab Admin Area to immediately block all access. NOTE: **Note**: diff --git a/doc/administration/geo/replication/img/adding_a_secondary_node.png b/doc/administration/geo/replication/img/adding_a_secondary_node.png index 5421b578672..e33b690da18 100644 Binary files a/doc/administration/geo/replication/img/adding_a_secondary_node.png and b/doc/administration/geo/replication/img/adding_a_secondary_node.png differ diff --git a/doc/administration/geo/replication/img/single_git_add_geolocation_rule.png b/doc/administration/geo/replication/img/single_git_add_geolocation_rule.png index 4b04ba8d1f1..0d1b12e925f 100644 Binary files a/doc/administration/geo/replication/img/single_git_add_geolocation_rule.png and b/doc/administration/geo/replication/img/single_git_add_geolocation_rule.png differ diff --git a/doc/administration/geo/replication/img/single_git_add_traffic_policy_endpoints.png b/doc/administration/geo/replication/img/single_git_add_traffic_policy_endpoints.png index c19ad57c953..4dfb78986da 100644 Binary files a/doc/administration/geo/replication/img/single_git_add_traffic_policy_endpoints.png and b/doc/administration/geo/replication/img/single_git_add_traffic_policy_endpoints.png differ diff --git a/doc/administration/geo/replication/img/single_git_clone_panel.png b/doc/administration/geo/replication/img/single_git_clone_panel.png index 8aa0bd2f7d8..427224f5b78 100644 Binary files a/doc/administration/geo/replication/img/single_git_clone_panel.png and b/doc/administration/geo/replication/img/single_git_clone_panel.png differ diff --git a/doc/administration/geo/replication/img/single_git_create_policy_records_with_traffic_policy.png b/doc/administration/geo/replication/img/single_git_create_policy_records_with_traffic_policy.png index a554532f3b8..ecc4859ca17 100644 Binary files a/doc/administration/geo/replication/img/single_git_create_policy_records_with_traffic_policy.png and b/doc/administration/geo/replication/img/single_git_create_policy_records_with_traffic_policy.png differ diff --git a/doc/administration/geo/replication/img/single_git_created_policy_record.png b/doc/administration/geo/replication/img/single_git_created_policy_record.png index 74c42395e15..f541c0dd236 100644 Binary files a/doc/administration/geo/replication/img/single_git_created_policy_record.png and b/doc/administration/geo/replication/img/single_git_created_policy_record.png differ diff --git a/doc/administration/geo/replication/img/single_git_name_policy.png b/doc/administration/geo/replication/img/single_git_name_policy.png index 1a976539e94..5571a41cb3c 100644 Binary files a/doc/administration/geo/replication/img/single_git_name_policy.png and b/doc/administration/geo/replication/img/single_git_name_policy.png differ diff --git a/doc/administration/geo/replication/img/single_git_policy_diagram.png b/doc/administration/geo/replication/img/single_git_policy_diagram.png index d62952dbbb3..eacd4de0e29 100644 Binary files a/doc/administration/geo/replication/img/single_git_policy_diagram.png and b/doc/administration/geo/replication/img/single_git_policy_diagram.png differ diff --git a/doc/administration/geo/replication/img/single_git_traffic_policies.png b/doc/administration/geo/replication/img/single_git_traffic_policies.png index b3193c23d99..197b0ac182f 100644 Binary files a/doc/administration/geo/replication/img/single_git_traffic_policies.png and b/doc/administration/geo/replication/img/single_git_traffic_policies.png differ diff --git a/doc/administration/geo/replication/troubleshooting.md b/doc/administration/geo/replication/troubleshooting.md index e60a70d57c9..05916e02255 100644 --- a/doc/administration/geo/replication/troubleshooting.md +++ b/doc/administration/geo/replication/troubleshooting.md @@ -208,9 +208,9 @@ sudo gitlab-rake gitlab:geo:check Checking Geo ... Finished ``` - - Ensure that you have added the secondary node in the admin area of the primary node. + - Ensure that you have added the secondary node in the Admin Area of the primary node. - Ensure that you entered the `external_url` or `gitlab_rails['geo_node_name']` when adding the secondary node in the admin are of the primary node. - - Prior to GitLab 12.4, edit the secondary node in the admin area of the primary node and ensure that there is a trailing `/` in the `Name` field. + - Prior to GitLab 12.4, edit the secondary node in the Admin Area of the primary node and ensure that there is a trailing `/` in the `Name` field. 1. Check returns Exception: PG::UndefinedTable: ERROR: relation "geo_nodes" does not exist diff --git a/doc/administration/gitaly/img/architecture_v12_4.png b/doc/administration/gitaly/img/architecture_v12_4.png index 1054083bb28..6a3955a483b 100644 Binary files a/doc/administration/gitaly/img/architecture_v12_4.png and b/doc/administration/gitaly/img/architecture_v12_4.png differ diff --git a/doc/administration/img/repository_storages_admin_ui.png b/doc/administration/img/repository_storages_admin_ui.png index 315b4b0144c..51b2f5f8c15 100644 Binary files a/doc/administration/img/repository_storages_admin_ui.png and b/doc/administration/img/repository_storages_admin_ui.png differ diff --git a/doc/administration/integration/terminal.md b/doc/administration/integration/terminal.md index 1af15648b97..42acc4cb80e 100644 --- a/doc/administration/integration/terminal.md +++ b/doc/administration/integration/terminal.md @@ -96,6 +96,6 @@ they will receive a `Connection failed` message. in GitLab 8.17. Terminal sessions use long-lived connections; by default, these may last -forever. You can configure a maximum session time in the Admin area of your +forever. You can configure a maximum session time in the Admin Area of your GitLab instance if you find this undesirable from a scalability or security point of view. diff --git a/doc/administration/job_artifacts.md b/doc/administration/job_artifacts.md index ec2f40700f5..2cc2cb1751b 100644 --- a/doc/administration/job_artifacts.md +++ b/doc/administration/job_artifacts.md @@ -267,7 +267,7 @@ you can flip the feature flag from a Rails console. ## Set the maximum file size of the artifacts Provided the artifacts are enabled, you can change the maximum file size of the -artifacts through the [Admin area settings](../user/admin_area/settings/continuous_integration.md#maximum-artifacts-size-core-only). +artifacts through the [Admin Area settings](../user/admin_area/settings/continuous_integration.md#maximum-artifacts-size-core-only). ## Storage statistics diff --git a/doc/administration/monitoring/performance/grafana_configuration.md b/doc/administration/monitoring/performance/grafana_configuration.md index 5f3882918a8..9047a572fd2 100644 --- a/doc/administration/monitoring/performance/grafana_configuration.md +++ b/doc/administration/monitoring/performance/grafana_configuration.md @@ -113,14 +113,14 @@ repository for more information on this process. If you have set up Grafana, you can enable a link to access it easily from the sidebar: -1. Go to the admin area under **Settings > Metrics and profiling** - and expand "Metrics - Grafana". +1. Go to the **Admin Area > Settings > Metrics and profiling**. +1. Expand **Metrics - Grafana**. 1. Check the "Enable access to Grafana" checkbox. 1. If Grafana is enabled through Omnibus GitLab and on the same server, leave "Grafana URL" unchanged. In any other case, enter the full URL path of the Grafana instance. 1. Click **Save changes**. -1. The new link will be available in the admin area under **Monitoring > Metrics Dashboard**. +1. The new link will be available in the **Admin Area > Monitoring > Metrics Dashboard**. ## Security Update diff --git a/doc/administration/monitoring/performance/img/performance_bar.png b/doc/administration/monitoring/performance/img/performance_bar.png index d206d5a4268..be06e0b2f94 100644 Binary files a/doc/administration/monitoring/performance/img/performance_bar.png and b/doc/administration/monitoring/performance/img/performance_bar.png differ diff --git a/doc/administration/monitoring/performance/img/performance_bar_frontend.png b/doc/administration/monitoring/performance/img/performance_bar_frontend.png index 489f855fe33..32a241e032b 100644 Binary files a/doc/administration/monitoring/performance/img/performance_bar_frontend.png and b/doc/administration/monitoring/performance/img/performance_bar_frontend.png differ diff --git a/doc/administration/monitoring/performance/img/performance_bar_gitaly_threshold.png b/doc/administration/monitoring/performance/img/performance_bar_gitaly_threshold.png index d4bf5c69ffa..4e42d904cdf 100644 Binary files a/doc/administration/monitoring/performance/img/performance_bar_gitaly_threshold.png and b/doc/administration/monitoring/performance/img/performance_bar_gitaly_threshold.png differ diff --git a/doc/administration/monitoring/performance/img/performance_bar_request_selector_warning.png b/doc/administration/monitoring/performance/img/performance_bar_request_selector_warning.png index 966549554a4..74711387ffe 100644 Binary files a/doc/administration/monitoring/performance/img/performance_bar_request_selector_warning.png and b/doc/administration/monitoring/performance/img/performance_bar_request_selector_warning.png differ diff --git a/doc/administration/monitoring/performance/img/performance_bar_request_selector_warning_expanded.png b/doc/administration/monitoring/performance/img/performance_bar_request_selector_warning_expanded.png index 3362186bb48..36553f513e1 100644 Binary files a/doc/administration/monitoring/performance/img/performance_bar_request_selector_warning_expanded.png and b/doc/administration/monitoring/performance/img/performance_bar_request_selector_warning_expanded.png differ diff --git a/doc/administration/monitoring/performance/performance_bar.md b/doc/administration/monitoring/performance/performance_bar.md index 98c611ea140..fe4c29fbb01 100644 --- a/doc/administration/monitoring/performance/performance_bar.md +++ b/doc/administration/monitoring/performance/performance_bar.md @@ -52,8 +52,9 @@ And requests with warnings are indicated in the request selector with a ## Enable the Performance Bar via the Admin panel GitLab Performance Bar is disabled by default. To enable it for a given group, -navigate to the Admin area in **Settings > Metrics and Profiling > Profiling - Performance bar** -(`admin/application_settings/metrics_and_profiling`). +navigate to **Admin Area > Settings > Metrics and profiling** +(`admin/application_settings/metrics_and_profiling`), and expand the section +**Profiling - Performance bar**. The only required setting you need to set is the full path of the group that will be allowed to display the Performance Bar. diff --git a/doc/administration/monitoring/prometheus/gitlab_metrics.md b/doc/administration/monitoring/prometheus/gitlab_metrics.md index b0f1a5736b5..adb7a433303 100644 --- a/doc/administration/monitoring/prometheus/gitlab_metrics.md +++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md @@ -6,8 +6,8 @@ installations from source you'll have to configure it yourself. To enable the GitLab Prometheus metrics: -1. Log into GitLab as an administrator, and go to the Admin area. -1. Navigate to GitLab's **Settings > Metrics and profiling**. +1. Log into GitLab as an administrator. +1. Navigate to **Admin Area > Settings > Metrics and profiling**. 1. Find the **Metrics - Prometheus** section, and click **Enable Prometheus Metrics**. 1. [Restart GitLab](../../restart_gitlab.md#omnibus-gitlab-restart) for the changes to take effect. diff --git a/doc/administration/operations/extra_sidekiq_processes.md b/doc/administration/operations/extra_sidekiq_processes.md index e15f91ebab2..1be89f759da 100644 --- a/doc/administration/operations/extra_sidekiq_processes.md +++ b/doc/administration/operations/extra_sidekiq_processes.md @@ -59,8 +59,8 @@ To start extra Sidekiq processes, you must enable `sidekiq-cluster`: sudo gitlab-ctl reconfigure ``` -Once the extra Sidekiq processes are added, you can visit the "Background Jobs" -section under the admin area in GitLab (`/admin/background_jobs`). +Once the extra Sidekiq processes are added, you can visit the +**Admin Area > Monitoring > Background Jobs** (`/admin/background_jobs`) in GitLab. ![Extra Sidekiq processes](img/sidekiq-cluster.png) diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md index e876d71342e..1254d96f341 100644 --- a/doc/administration/pages/index.md +++ b/doc/administration/pages/index.md @@ -257,8 +257,8 @@ When adding a custom domain, users will be required to prove they own it by adding a GitLab-controlled verification code to the DNS records for that domain. If your userbase is private or otherwise trusted, you can disable the -verification requirement. Navigate to `Admin area ➔ Settings` and uncheck -**Require users to prove ownership of custom domains** in the Pages section. +verification requirement. Navigate to **Admin Area > Settings > Preferences** and +uncheck **Require users to prove ownership of custom domains** in the **Pages** section. This setting is enabled by default. ### Let's Encrypt integration @@ -395,8 +395,8 @@ Omnibus GitLab 11.1. ## Set maximum pages size -You can configure the maximum size of the unpacked archive per project in the -Admin area. Under Application settings, edit the **Maximum size of pages (MB)**. +You can configure the maximum size of the unpacked archive per project in +**Admin Area > Settings > Preferences > Pages**, in **Maximum size of pages (MB)**. The default is 100MB. ### Override maximum pages size per project or group **(PREMIUM ONLY)** diff --git a/doc/administration/pages/source.md b/doc/administration/pages/source.md index be8bba3c95b..738eb87d53d 100644 --- a/doc/administration/pages/source.md +++ b/doc/administration/pages/source.md @@ -433,8 +433,8 @@ are stored. ## Set maximum Pages size -The maximum size of the unpacked archive per project can be configured in the -Admin area under the Application settings in the **Maximum size of pages (MB)**. +The maximum size of the unpacked archive per project can be configured in +**Admin Area > Settings > Preferences > Pages**, in **Maximum size of pages (MB)**. The default is 100MB. ## Backup diff --git a/doc/administration/repository_storage_paths.md b/doc/administration/repository_storage_paths.md index d31b1d7fcd6..dfd0a618a73 100644 --- a/doc/administration/repository_storage_paths.md +++ b/doc/administration/repository_storage_paths.md @@ -110,7 +110,7 @@ Once you set the multiple storage paths, you can choose where new projects will be stored under **Admin Area > Settings > Repository > Repository storage > Storage nodes for new projects**. -![Choose repository storage path in Admin area](img/repository_storages_admin_ui.png) +![Choose repository storage path in Admin Area](img/repository_storages_admin_ui.png) Beginning with GitLab 8.13.4, multiple paths can be chosen. New projects will be randomly placed on one of the selected paths. diff --git a/doc/api/settings.md b/doc/api/settings.md index fa0efcaa5f0..316e5bb0109 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -180,7 +180,7 @@ are listed in the descriptions of the relevant settings. | Attribute | Type | Required | Description | | --------- | ---- | :------: | ----------- | -| `admin_notification_email` | string | no | Abuse reports will be sent to this address if it is set. Abuse reports are always available in the admin area. | +| `admin_notification_email` | string | no | Abuse reports will be sent to this address if it is set. Abuse reports are always available in the Admin Area. | | `after_sign_out_path` | string | no | Where to redirect users after logout. | | `after_sign_up_text` | string | no | Text shown to the user after signing up | | `akismet_api_key` | string | required by: `akismet_enabled` | API key for Akismet spam protection. | diff --git a/doc/api/system_hooks.md b/doc/api/system_hooks.md index 1b8c23b8e2d..b09b11dfd2a 100644 --- a/doc/api/system_hooks.md +++ b/doc/api/system_hooks.md @@ -3,7 +3,7 @@ All methods require administrator authorization. The URL endpoint of the system hooks can also be configured using the UI in -the admin area under **Hooks** (`/admin/hooks`). +the **Admin Area > System Hooks** (`/admin/hooks`). Read more about [system hooks](../system_hooks/system_hooks.md). diff --git a/doc/ci/img/pipeline-delete.png b/doc/ci/img/pipeline-delete.png index 65b42100099..d9dba1f455d 100644 Binary files a/doc/ci/img/pipeline-delete.png and b/doc/ci/img/pipeline-delete.png differ diff --git a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/img/merged_result_pipeline_v12_3.png b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/img/merged_result_pipeline_v12_3.png index 6f0752bb940..8da2970ab5a 100644 Binary files a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/img/merged_result_pipeline_v12_3.png and b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/img/merged_result_pipeline_v12_3.png differ diff --git a/doc/ci/runners/README.md b/doc/ci/runners/README.md index 4011ae4df70..5ed4616bd0a 100644 --- a/doc/ci/runners/README.md +++ b/doc/ci/runners/README.md @@ -62,7 +62,7 @@ You can only register a shared Runner if you are an admin of the GitLab instance 1. Grab the shared-Runner token on the `admin/runners` page - ![Shared Runners admin area](img/shared_runners_admin.png) + ![Shared Runners Admin Area](img/shared_runners_admin.png) 1. [Register the Runner][register] @@ -100,7 +100,7 @@ If you are an admin on your GitLab instance, you can turn any shared Runner into a specific one, but not the other way around. Keep in mind that this is a one way transition. -1. Go to the Runners in the admin area **Overview > Runners** (`/admin/runners`) +1. Go to the Runners in the **Admin Area > Overview > Runners** (`/admin/runners`) and find your Runner 1. Enable any projects under **Restrict projects for this Runner** to be used with the Runner @@ -402,7 +402,7 @@ different places. To view the IP address of a shared Runner you must have admin access to the GitLab instance. To determine this: -1. Visit **Admin area ➔ Overview ➔ Runners** +1. Visit **Admin Area ➔ Overview ➔ Runners** 1. Look for the Runner in the table and you should see a column for "IP Address" ![shared Runner IP address](img/shared_runner_ip_address.png) diff --git a/doc/ci/variables/img/inherited_group_variables_v12_5.png b/doc/ci/variables/img/inherited_group_variables_v12_5.png index f9043df051c..fd41859605f 100644 Binary files a/doc/ci/variables/img/inherited_group_variables_v12_5.png and b/doc/ci/variables/img/inherited_group_variables_v12_5.png differ diff --git a/doc/development/documentation/site_architecture/global_nav.md b/doc/development/documentation/site_architecture/global_nav.md index be4d5b5353f..518850358ff 100644 --- a/doc/development/documentation/site_architecture/global_nav.md +++ b/doc/development/documentation/site_architecture/global_nav.md @@ -86,7 +86,7 @@ The available sections are described on the table below: | Section | Description | | ------------- | ------------------------------------------ | | User | Documentation for the GitLab's user UI. | -| Administrator | Documentation for the GitLab's admin area. | +| Administrator | Documentation for the GitLab's Admin Area. | | Contributor | Documentation for developing GitLab. | The majority of the links available on the nav were added according to the UI. diff --git a/doc/development/event_tracking/index.md b/doc/development/event_tracking/index.md index ac19053320d..13b08e53768 100644 --- a/doc/development/event_tracking/index.md +++ b/doc/development/event_tracking/index.md @@ -53,7 +53,7 @@ Tracking can be enabled at: We utilize Snowplow for the majority of our tracking strategy, and it can be enabled by navigating to: -- **Admin area > Settings > Integrations** in the UI. +- **Admin Area > Settings > Integrations** in the UI. - `admin/application_settings/integrations` in your browser. The following configuration is required: diff --git a/doc/development/fe_guide/img/graphiql_explorer_v12_4.png b/doc/development/fe_guide/img/graphiql_explorer_v12_4.png index 8981b37ba23..b50424f7f8d 100644 Binary files a/doc/development/fe_guide/img/graphiql_explorer_v12_4.png and b/doc/development/fe_guide/img/graphiql_explorer_v12_4.png differ diff --git a/doc/development/img/build_package_v12_6.png b/doc/development/img/build_package_v12_6.png index c3d99e6c6ce..32a3ebedba4 100644 Binary files a/doc/development/img/build_package_v12_6.png and b/doc/development/img/build_package_v12_6.png differ diff --git a/doc/development/img/memory_ruby_heap_fragmentation.png b/doc/development/img/memory_ruby_heap_fragmentation.png index 6567abe58bb..4703da7491d 100644 Binary files a/doc/development/img/memory_ruby_heap_fragmentation.png and b/doc/development/img/memory_ruby_heap_fragmentation.png differ diff --git a/doc/development/img/trigger_build_package_v12_6.png b/doc/development/img/trigger_build_package_v12_6.png index 6f5879bd8c4..ca6797ebf65 100644 Binary files a/doc/development/img/trigger_build_package_v12_6.png and b/doc/development/img/trigger_build_package_v12_6.png differ diff --git a/doc/development/testing_guide/img/k9s.png b/doc/development/testing_guide/img/k9s.png index c4b222f0b64..34585b2a43a 100644 Binary files a/doc/development/testing_guide/img/k9s.png and b/doc/development/testing_guide/img/k9s.png differ diff --git a/doc/integration/elasticsearch.md b/doc/integration/elasticsearch.md index 2d827f53fcf..cf160f59040 100644 --- a/doc/integration/elasticsearch.md +++ b/doc/integration/elasticsearch.md @@ -40,7 +40,7 @@ NOTE: **Note:** **For a single node Elasticsearch cluster the functional cluster health status will be yellow** (will never be green) because the primary shard is allocated but replicas can not be as there is no other node to which Elasticsearch can assign a replica. Once the data is added to the database or repository and [Elasticsearch is -enabled in the admin area](#enabling-elasticsearch) the search index will be +enabled in the Admin Area](#enabling-elasticsearch) the search index will be updated automatically. ## Elasticsearch repository indexer @@ -201,7 +201,7 @@ To backfill existing data, you can use one of the methods below to index it in b > [Introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/15390) in [GitLab Starter](https://about.gitlab.com/pricing/) 12.3. -To index via the admin area: +To index via the Admin Area: 1. [Configure your Elasticsearch host and port](#enabling-elasticsearch). 1. Create empty indexes using one of the following commands: diff --git a/doc/integration/img/authorize_vault_with_gitlab_v12_6.png b/doc/integration/img/authorize_vault_with_gitlab_v12_6.png index dc5bc954cd7..2c9810bc9e8 100644 Binary files a/doc/integration/img/authorize_vault_with_gitlab_v12_6.png and b/doc/integration/img/authorize_vault_with_gitlab_v12_6.png differ diff --git a/doc/integration/img/gitlab_oauth_vault_v12_6.png b/doc/integration/img/gitlab_oauth_vault_v12_6.png index f952abc2c6d..08fc56c8ec9 100644 Binary files a/doc/integration/img/gitlab_oauth_vault_v12_6.png and b/doc/integration/img/gitlab_oauth_vault_v12_6.png differ diff --git a/doc/integration/img/sign_into_vault_with_gitlab_v12_6.png b/doc/integration/img/sign_into_vault_with_gitlab_v12_6.png index 8afa2c6aabd..474473e334d 100644 Binary files a/doc/integration/img/sign_into_vault_with_gitlab_v12_6.png and b/doc/integration/img/sign_into_vault_with_gitlab_v12_6.png differ diff --git a/doc/integration/img/signed_into_vault_via_oidc_v12_6.png b/doc/integration/img/signed_into_vault_via_oidc_v12_6.png index 0ad81ef40e6..0a7f86ff5f0 100644 Binary files a/doc/integration/img/signed_into_vault_via_oidc_v12_6.png and b/doc/integration/img/signed_into_vault_via_oidc_v12_6.png differ diff --git a/doc/integration/img/sourcegraph_admin_v12_5.png b/doc/integration/img/sourcegraph_admin_v12_5.png index 23e38f56619..54511541c87 100644 Binary files a/doc/integration/img/sourcegraph_admin_v12_5.png and b/doc/integration/img/sourcegraph_admin_v12_5.png differ diff --git a/doc/integration/img/sourcegraph_demo_v12_5.png b/doc/integration/img/sourcegraph_demo_v12_5.png index c70448c0a8a..35a2e2a89e3 100644 Binary files a/doc/integration/img/sourcegraph_demo_v12_5.png and b/doc/integration/img/sourcegraph_demo_v12_5.png differ diff --git a/doc/integration/img/sourcegraph_popover_v12_5.png b/doc/integration/img/sourcegraph_popover_v12_5.png index 878d6143646..62fa48129b2 100644 Binary files a/doc/integration/img/sourcegraph_popover_v12_5.png and b/doc/integration/img/sourcegraph_popover_v12_5.png differ diff --git a/doc/integration/img/sourcegraph_user_preferences_v12_5.png b/doc/integration/img/sourcegraph_user_preferences_v12_5.png index 2c0e138e296..7b7f8945431 100644 Binary files a/doc/integration/img/sourcegraph_user_preferences_v12_5.png and b/doc/integration/img/sourcegraph_user_preferences_v12_5.png differ diff --git a/doc/integration/oauth_provider.md b/doc/integration/oauth_provider.md index 36b4836e6b3..6c9b272f35b 100644 --- a/doc/integration/oauth_provider.md +++ b/doc/integration/oauth_provider.md @@ -26,7 +26,7 @@ The 'GitLab Importer' feature is also using the OAuth protocol to give access to repositories without sharing user credentials to your GitLab.com account. GitLab supports two ways of adding a new OAuth2 application to an instance. You -can either add an application as a regular user or add it in the admin area. +can either add an application as a regular user or add it in the Admin Area. What this means is that GitLab can actually have instance-wide and a user-wide applications. There is no difference between them except for the different permission levels they are set (user/admin). The default callback URL is @@ -51,14 +51,14 @@ connects to GitLab. ![OAuth application ID and secret](img/oauth_provider_application_id_secret.png) -## OAuth applications in the admin area +## OAuth applications in the Admin Area To create an application that does not belong to a certain user, you can create -it from the admin area. +it from the Admin Area. ![OAuth admin_applications](img/oauth_provider_admin_application.png) -You're also able to mark an application as _trusted_ when creating it through the admin area. By doing that, +You're also able to mark an application as _trusted_ when creating it through the Admin Area. By doing that, the user authorization step is automatically skipped for this application. ## Authorized applications diff --git a/doc/public_access/img/project_visibility_confirmation_v12_6.png b/doc/public_access/img/project_visibility_confirmation_v12_6.png index ac4d70ff11a..8fba57f353b 100644 Binary files a/doc/public_access/img/project_visibility_confirmation_v12_6.png and b/doc/public_access/img/project_visibility_confirmation_v12_6.png differ diff --git a/doc/push_rules/push_rules.md b/doc/push_rules/push_rules.md index d778d6b929c..f26cf0cece0 100644 --- a/doc/push_rules/push_rules.md +++ b/doc/push_rules/push_rules.md @@ -52,7 +52,7 @@ will get rejected. ### Custom Push Rules **(CORE ONLY)** It's possible to create custom push rules rather than the push rules available in -**Admin area > Push Rules** by using more advanced server-side Git hooks. +**Admin Area > Push Rules** by using more advanced server-side Git hooks. See [custom server-side Git hooks](../administration/custom_hooks.md) for more information. @@ -60,7 +60,7 @@ See [custom server-side Git hooks](../administration/custom_hooks.md) for more i NOTE: **Note:** GitLab administrators can set push rules globally under -**Admin area > Push Rules** that all new projects will inherit. You can later +**Admin Area > Push Rules** that all new projects will inherit. You can later override them in a project's settings. 1. Navigate to your project's **Settings > Repository** and expand **Push Rules** diff --git a/doc/security/password_length_limits.md b/doc/security/password_length_limits.md index 235730eb825..c00fd78c4d3 100644 --- a/doc/security/password_length_limits.md +++ b/doc/security/password_length_limits.md @@ -49,7 +49,7 @@ From GitLab 12.6, the minimum password length set in this configuration file wil The user password length is set to a minimum of 8 characters by default. To change that using GitLab UI: -In the Admin area under **Settings** (`/admin/application_settings`), go to section **Sign-up Restrictions**. +In **Admin Area > Settings** (`/admin/application_settings`), go to the section **Sign-up restrictions**. [Minimum password length settings](../user/admin_area/img/minimum_password_length_settings_v12_6.png) diff --git a/doc/security/ssh_keys_restrictions.md b/doc/security/ssh_keys_restrictions.md index 4c60daf77f4..176b09168c4 100644 --- a/doc/security/ssh_keys_restrictions.md +++ b/doc/security/ssh_keys_restrictions.md @@ -17,8 +17,8 @@ algorithms. GitLab allows you to restrict the allowed SSH key technology as well as specify the minimum key length for each technology. -In the Admin area under **Settings** (`/admin/application_settings`), look for -the "Visibility and Access Controls" area: +In **Admin Area > Settings** (`/admin/application_settings`), expand the +**Visibility and access controls** section: ![SSH keys restriction admin settings](img/ssh_keys_restrictions_settings.png) diff --git a/doc/security/two_factor_authentication.md b/doc/security/two_factor_authentication.md index defc4669e69..39f92f95ba1 100644 --- a/doc/security/two_factor_authentication.md +++ b/doc/security/two_factor_authentication.md @@ -25,7 +25,7 @@ won't be able to leave the 2FA configuration area at `/profile/two_factor_auth`. To enable 2FA for all users: -1. Navigate to **Admin area > Settings > General** (`/admin/application_settings`). +1. Navigate to **Admin Area > Settings > General** (`/admin/application_settings`). 1. Expand the **Sign-in restrictions** section, where you can configure both. If you want 2FA enforcement to take effect on next login, change the grace diff --git a/doc/security/user_email_confirmation.md b/doc/security/user_email_confirmation.md index 7ba50acbb06..3abfbe96a59 100644 --- a/doc/security/user_email_confirmation.md +++ b/doc/security/user_email_confirmation.md @@ -8,7 +8,7 @@ GitLab can be configured to require confirmation of a user's email address when the user signs up. When this setting is enabled, the user is unable to sign in until they confirm their email address. -In the Admin area under **Settings** (`/admin/application_settings`), go to section +In **Admin Area > Settings** (`/admin/application_settings`), go to the section **Sign-up Restrictions** and look for the **Send confirmation email on sign-up** option.