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 | |
| parent | e0b84f4ba4b44c8ecf00be97843c40df2550b74c (diff) | |
| download | gitlab-ce-e8793358645d6c84b46ef56dafcbf834f20d6415.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
193 files changed, 118 insertions, 110 deletions
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 Binary files differindex 5421b578672..e33b690da18 100644 --- a/doc/administration/geo/replication/img/adding_a_secondary_node.png +++ b/doc/administration/geo/replication/img/adding_a_secondary_node.png 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 Binary files differindex 4b04ba8d1f1..0d1b12e925f 100644 --- a/doc/administration/geo/replication/img/single_git_add_geolocation_rule.png +++ b/doc/administration/geo/replication/img/single_git_add_geolocation_rule.png 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 Binary files differindex c19ad57c953..4dfb78986da 100644 --- 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 diff --git a/doc/administration/geo/replication/img/single_git_clone_panel.png b/doc/administration/geo/replication/img/single_git_clone_panel.png Binary files differindex 8aa0bd2f7d8..427224f5b78 100644 --- a/doc/administration/geo/replication/img/single_git_clone_panel.png +++ b/doc/administration/geo/replication/img/single_git_clone_panel.png 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 Binary files differindex a554532f3b8..ecc4859ca17 100644 --- 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 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 Binary files differindex 74c42395e15..f541c0dd236 100644 --- a/doc/administration/geo/replication/img/single_git_created_policy_record.png +++ b/doc/administration/geo/replication/img/single_git_created_policy_record.png diff --git a/doc/administration/geo/replication/img/single_git_name_policy.png b/doc/administration/geo/replication/img/single_git_name_policy.png Binary files differindex 1a976539e94..5571a41cb3c 100644 --- a/doc/administration/geo/replication/img/single_git_name_policy.png +++ b/doc/administration/geo/replication/img/single_git_name_policy.png diff --git a/doc/administration/geo/replication/img/single_git_policy_diagram.png b/doc/administration/geo/replication/img/single_git_policy_diagram.png Binary files differindex d62952dbbb3..eacd4de0e29 100644 --- a/doc/administration/geo/replication/img/single_git_policy_diagram.png +++ b/doc/administration/geo/replication/img/single_git_policy_diagram.png diff --git a/doc/administration/geo/replication/img/single_git_traffic_policies.png b/doc/administration/geo/replication/img/single_git_traffic_policies.png Binary files differindex b3193c23d99..197b0ac182f 100644 --- a/doc/administration/geo/replication/img/single_git_traffic_policies.png +++ b/doc/administration/geo/replication/img/single_git_traffic_policies.png 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 Binary files differindex 1054083bb28..6a3955a483b 100644 --- a/doc/administration/gitaly/img/architecture_v12_4.png +++ b/doc/administration/gitaly/img/architecture_v12_4.png diff --git a/doc/administration/img/repository_storages_admin_ui.png b/doc/administration/img/repository_storages_admin_ui.png Binary files differindex 315b4b0144c..51b2f5f8c15 100644 --- a/doc/administration/img/repository_storages_admin_ui.png +++ b/doc/administration/img/repository_storages_admin_ui.png 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 Binary files differindex d206d5a4268..be06e0b2f94 100644 --- a/doc/administration/monitoring/performance/img/performance_bar.png +++ b/doc/administration/monitoring/performance/img/performance_bar.png diff --git a/doc/administration/monitoring/performance/img/performance_bar_frontend.png b/doc/administration/monitoring/performance/img/performance_bar_frontend.png Binary files differindex 489f855fe33..32a241e032b 100644 --- a/doc/administration/monitoring/performance/img/performance_bar_frontend.png +++ b/doc/administration/monitoring/performance/img/performance_bar_frontend.png diff --git a/doc/administration/monitoring/performance/img/performance_bar_gitaly_threshold.png b/doc/administration/monitoring/performance/img/performance_bar_gitaly_threshold.png Binary files differindex d4bf5c69ffa..4e42d904cdf 100644 --- a/doc/administration/monitoring/performance/img/performance_bar_gitaly_threshold.png +++ b/doc/administration/monitoring/performance/img/performance_bar_gitaly_threshold.png 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 Binary files differindex 966549554a4..74711387ffe 100644 --- a/doc/administration/monitoring/performance/img/performance_bar_request_selector_warning.png +++ b/doc/administration/monitoring/performance/img/performance_bar_request_selector_warning.png 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 Binary files differindex 3362186bb48..36553f513e1 100644 --- 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 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.  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**. - + 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 Binary files differindex 65b42100099..d9dba1f455d 100644 --- a/doc/ci/img/pipeline-delete.png +++ b/doc/ci/img/pipeline-delete.png 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 Binary files differindex 6f0752bb940..8da2970ab5a 100644 --- 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 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 -  +  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"  diff --git a/doc/ci/variables/img/inherited_group_variables_v12_5.png b/doc/ci/variables/img/inherited_group_variables_v12_5.png Binary files differindex f9043df051c..fd41859605f 100644 --- a/doc/ci/variables/img/inherited_group_variables_v12_5.png +++ b/doc/ci/variables/img/inherited_group_variables_v12_5.png 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 Binary files differindex 8981b37ba23..b50424f7f8d 100644 --- a/doc/development/fe_guide/img/graphiql_explorer_v12_4.png +++ b/doc/development/fe_guide/img/graphiql_explorer_v12_4.png diff --git a/doc/development/img/build_package_v12_6.png b/doc/development/img/build_package_v12_6.png Binary files differindex c3d99e6c6ce..32a3ebedba4 100644 --- a/doc/development/img/build_package_v12_6.png +++ b/doc/development/img/build_package_v12_6.png diff --git a/doc/development/img/memory_ruby_heap_fragmentation.png b/doc/development/img/memory_ruby_heap_fragmentation.png Binary files differindex 6567abe58bb..4703da7491d 100644 --- a/doc/development/img/memory_ruby_heap_fragmentation.png +++ b/doc/development/img/memory_ruby_heap_fragmentation.png diff --git a/doc/development/img/trigger_build_package_v12_6.png b/doc/development/img/trigger_build_package_v12_6.png Binary files differindex 6f5879bd8c4..ca6797ebf65 100644 --- a/doc/development/img/trigger_build_package_v12_6.png +++ b/doc/development/img/trigger_build_package_v12_6.png diff --git a/doc/development/testing_guide/img/k9s.png b/doc/development/testing_guide/img/k9s.png Binary files differindex c4b222f0b64..34585b2a43a 100644 --- a/doc/development/testing_guide/img/k9s.png +++ b/doc/development/testing_guide/img/k9s.png 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 Binary files differindex dc5bc954cd7..2c9810bc9e8 100644 --- a/doc/integration/img/authorize_vault_with_gitlab_v12_6.png +++ b/doc/integration/img/authorize_vault_with_gitlab_v12_6.png diff --git a/doc/integration/img/gitlab_oauth_vault_v12_6.png b/doc/integration/img/gitlab_oauth_vault_v12_6.png Binary files differindex f952abc2c6d..08fc56c8ec9 100644 --- a/doc/integration/img/gitlab_oauth_vault_v12_6.png +++ b/doc/integration/img/gitlab_oauth_vault_v12_6.png 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 Binary files differindex 8afa2c6aabd..474473e334d 100644 --- a/doc/integration/img/sign_into_vault_with_gitlab_v12_6.png +++ b/doc/integration/img/sign_into_vault_with_gitlab_v12_6.png 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 Binary files differindex 0ad81ef40e6..0a7f86ff5f0 100644 --- a/doc/integration/img/signed_into_vault_via_oidc_v12_6.png +++ b/doc/integration/img/signed_into_vault_via_oidc_v12_6.png diff --git a/doc/integration/img/sourcegraph_admin_v12_5.png b/doc/integration/img/sourcegraph_admin_v12_5.png Binary files differindex 23e38f56619..54511541c87 100644 --- a/doc/integration/img/sourcegraph_admin_v12_5.png +++ b/doc/integration/img/sourcegraph_admin_v12_5.png diff --git a/doc/integration/img/sourcegraph_demo_v12_5.png b/doc/integration/img/sourcegraph_demo_v12_5.png Binary files differindex c70448c0a8a..35a2e2a89e3 100644 --- a/doc/integration/img/sourcegraph_demo_v12_5.png +++ b/doc/integration/img/sourcegraph_demo_v12_5.png diff --git a/doc/integration/img/sourcegraph_popover_v12_5.png b/doc/integration/img/sourcegraph_popover_v12_5.png Binary files differindex 878d6143646..62fa48129b2 100644 --- a/doc/integration/img/sourcegraph_popover_v12_5.png +++ b/doc/integration/img/sourcegraph_popover_v12_5.png diff --git a/doc/integration/img/sourcegraph_user_preferences_v12_5.png b/doc/integration/img/sourcegraph_user_preferences_v12_5.png Binary files differindex 2c0e138e296..7b7f8945431 100644 --- a/doc/integration/img/sourcegraph_user_preferences_v12_5.png +++ b/doc/integration/img/sourcegraph_user_preferences_v12_5.png 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 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.  -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 Binary files differindex ac4d70ff11a..8fba57f353b 100644 --- a/doc/public_access/img/project_visibility_confirmation_v12_6.png +++ b/doc/public_access/img/project_visibility_confirmation_v12_6.png 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:  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. <!-- ## Troubleshooting diff --git a/doc/security/webhooks.md b/doc/security/webhooks.md index d7baf786906..8570228ee96 100644 --- a/doc/security/webhooks.md +++ b/doc/security/webhooks.md @@ -40,8 +40,7 @@ to `127.0.0.1`, `::1` and `0.0.0.0`, as well as IPv4 `10.0.0.0/8`, `172.16.0.0/1 This behavior can be overridden by enabling the option *"Allow requests to the local network from web hooks and services"* in the *"Outbound requests"* section -inside the Admin area under **Settings** -(`/admin/application_settings/network`): +inside the **Admin Area > Settings** (`/admin/application_settings/network`):  diff --git a/doc/ssh/README.md b/doc/ssh/README.md index 80b8db84bed..2627c0ec7c1 100644 --- a/doc/ssh/README.md +++ b/doc/ssh/README.md @@ -376,7 +376,7 @@ Global Shared Keys can provide greater security compared to Per-Project Deploy Keys since an administrator of the target integrated system is the only one who needs to know and configure the private key. -GitLab administrators set up Global Deploy keys in the Admin area under the +GitLab administrators set up Global Deploy keys in the Admin Area under the section **Deploy Keys**. Ensure keys have a meaningful title as that will be the primary way for project maintainers and owners to identify the correct Global Deploy key to add. For instance, if the key gives access to a SaaS CI instance, diff --git a/doc/tools/email.md b/doc/tools/email.md index 3088b0b63e7..e9ff88152ba 100644 --- a/doc/tools/email.md +++ b/doc/tools/email.md @@ -5,7 +5,7 @@ type: howto, reference # Email from GitLab **(STARTER ONLY)** GitLab provides a simple tool to administrators for emailing all users, or users of -a chosen group or project, right from the admin area. Users will receive the email +a chosen group or project, right from the Admin Area. Users will receive the email at their primary email address. ## Use-cases @@ -16,8 +16,8 @@ at their primary email address. ## Sending emails to users from within GitLab -1. Go to the admin area using the wrench icon in the top right corner and - navigate to **Overview > Users > Send email to users**. +1. Navigate to the **Admin Area > Overview > Users** and press the + **Send email to users** button.  diff --git a/doc/topics/autodevops/img/autodevops_banner_v12_6.png b/doc/topics/autodevops/img/autodevops_banner_v12_6.png Binary files differindex 51ccdeeaa52..abf492c5247 100644 --- a/doc/topics/autodevops/img/autodevops_banner_v12_6.png +++ b/doc/topics/autodevops/img/autodevops_banner_v12_6.png diff --git a/doc/topics/autodevops/img/guide_base_domain_v12_3.png b/doc/topics/autodevops/img/guide_base_domain_v12_3.png Binary files differindex 0c8ab9b26e4..7d3b6a2f905 100644 --- a/doc/topics/autodevops/img/guide_base_domain_v12_3.png +++ b/doc/topics/autodevops/img/guide_base_domain_v12_3.png diff --git a/doc/topics/autodevops/img/guide_cluster_apps_v12_3.png b/doc/topics/autodevops/img/guide_cluster_apps_v12_3.png Binary files differindex f903ae40c02..9be414434c7 100644 --- a/doc/topics/autodevops/img/guide_cluster_apps_v12_3.png +++ b/doc/topics/autodevops/img/guide_cluster_apps_v12_3.png diff --git a/doc/topics/autodevops/img/guide_create_project_v12_3.png b/doc/topics/autodevops/img/guide_create_project_v12_3.png Binary files differindex 68ab7f23f3c..a22730520ef 100644 --- a/doc/topics/autodevops/img/guide_create_project_v12_3.png +++ b/doc/topics/autodevops/img/guide_create_project_v12_3.png diff --git a/doc/topics/autodevops/img/guide_enable_autodevops_v12_3.png b/doc/topics/autodevops/img/guide_enable_autodevops_v12_3.png Binary files differindex 7f0e7c60086..a3bcaeb99ae 100644 --- a/doc/topics/autodevops/img/guide_enable_autodevops_v12_3.png +++ b/doc/topics/autodevops/img/guide_enable_autodevops_v12_3.png diff --git a/doc/topics/autodevops/img/guide_environments_metrics_v12_3.png b/doc/topics/autodevops/img/guide_environments_metrics_v12_3.png Binary files differindex 74f997a5122..47bf3fda53a 100644 --- a/doc/topics/autodevops/img/guide_environments_metrics_v12_3.png +++ b/doc/topics/autodevops/img/guide_environments_metrics_v12_3.png diff --git a/doc/topics/autodevops/img/guide_environments_v12_3.png b/doc/topics/autodevops/img/guide_environments_v12_3.png Binary files differindex 0ad282cfe4e..87253f9929d 100644 --- a/doc/topics/autodevops/img/guide_environments_v12_3.png +++ b/doc/topics/autodevops/img/guide_environments_v12_3.png diff --git a/doc/topics/autodevops/img/guide_first_pipeline_v12_3.png b/doc/topics/autodevops/img/guide_first_pipeline_v12_3.png Binary files differindex 7654b4f0934..9b51b5cfdd8 100644 --- a/doc/topics/autodevops/img/guide_first_pipeline_v12_3.png +++ b/doc/topics/autodevops/img/guide_first_pipeline_v12_3.png diff --git a/doc/topics/autodevops/img/guide_gitlab_gke_details_v12_3.png b/doc/topics/autodevops/img/guide_gitlab_gke_details_v12_3.png Binary files differindex ba2b00dd984..2f3f8259316 100644 --- a/doc/topics/autodevops/img/guide_gitlab_gke_details_v12_3.png +++ b/doc/topics/autodevops/img/guide_gitlab_gke_details_v12_3.png diff --git a/doc/topics/autodevops/img/guide_google_signin_v12_3.png b/doc/topics/autodevops/img/guide_google_signin_v12_3.png Binary files differindex ac8a325dde6..58bcc5e67b6 100644 --- a/doc/topics/autodevops/img/guide_google_signin_v12_3.png +++ b/doc/topics/autodevops/img/guide_google_signin_v12_3.png diff --git a/doc/topics/autodevops/img/guide_ide_commit_v12_3.png b/doc/topics/autodevops/img/guide_ide_commit_v12_3.png Binary files differindex c40658e9ba9..afea0dc8fb4 100644 --- a/doc/topics/autodevops/img/guide_ide_commit_v12_3.png +++ b/doc/topics/autodevops/img/guide_ide_commit_v12_3.png diff --git a/doc/topics/autodevops/img/guide_merge_request_review_app_v12_3.png b/doc/topics/autodevops/img/guide_merge_request_review_app_v12_3.png Binary files differindex e1a4f181744..e94654f4e50 100644 --- a/doc/topics/autodevops/img/guide_merge_request_review_app_v12_3.png +++ b/doc/topics/autodevops/img/guide_merge_request_review_app_v12_3.png diff --git a/doc/topics/autodevops/img/guide_merge_request_v12_3.png b/doc/topics/autodevops/img/guide_merge_request_v12_3.png Binary files differindex 8c70620162c..5565be701cd 100644 --- a/doc/topics/autodevops/img/guide_merge_request_v12_3.png +++ b/doc/topics/autodevops/img/guide_merge_request_v12_3.png diff --git a/doc/topics/autodevops/img/guide_pipeline_stages_v12_3.png b/doc/topics/autodevops/img/guide_pipeline_stages_v12_3.png Binary files differindex f55a985f543..b9bab112a9f 100644 --- a/doc/topics/autodevops/img/guide_pipeline_stages_v12_3.png +++ b/doc/topics/autodevops/img/guide_pipeline_stages_v12_3.png diff --git a/doc/topics/autodevops/img/guide_project_landing_page_v12_3.png b/doc/topics/autodevops/img/guide_project_landing_page_v12_3.png Binary files differindex 4d62588ed90..7eb2ee3692f 100644 --- a/doc/topics/autodevops/img/guide_project_landing_page_v12_3.png +++ b/doc/topics/autodevops/img/guide_project_landing_page_v12_3.png diff --git a/doc/topics/autodevops/img/guide_project_template_v12_3.png b/doc/topics/autodevops/img/guide_project_template_v12_3.png Binary files differindex 9ce730518d0..2b8d7224747 100644 --- a/doc/topics/autodevops/img/guide_project_template_v12_3.png +++ b/doc/topics/autodevops/img/guide_project_template_v12_3.png diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index db622beb253..c52c5832591 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -184,7 +184,7 @@ The Auto DevOps base domain is required if you want to make use of places: - either under the cluster's settings, whether for [projects](../../user/project/clusters/index.md#base-domain) or [groups](../../user/group/clusters/index.md#base-domain) -- or in instance-wide settings in the **admin area > Settings** under the "Continuous Integration and Delivery" section +- or in instance-wide settings in the **Admin Area > Settings** under the "Continuous Integration and Delivery" section - or at the project level as a variable: `KUBE_INGRESS_BASE_DOMAIN` - or at the group level as a variable: `KUBE_INGRESS_BASE_DOMAIN`. @@ -263,7 +263,7 @@ the subgroup or project. Even when disabled at the instance level, group owners and project maintainers can still enable Auto DevOps at the group and project level, respectively. -1. Go to **Admin area > Settings > Continuous Integration and Deployment**. +1. Go to **Admin Area > Settings > Continuous Integration and Deployment**. 1. Toggle the checkbox labeled **Default to Auto DevOps pipeline for all projects**. 1. If enabling, optionally set up the Auto DevOps [base domain](#auto-devops-base-domain) which will be used for Auto Deploy and Auto Review Apps. 1. Click **Save changes** for the changes to take effect. 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 diff --git a/doc/user/application_security/dependency_list/img/dependency_list_v12_3.png b/doc/user/application_security/dependency_list/img/dependency_list_v12_3.png Binary files differindex 1ae44687ed5..8eeadb34504 100644 --- a/doc/user/application_security/dependency_list/img/dependency_list_v12_3.png +++ b/doc/user/application_security/dependency_list/img/dependency_list_v12_3.png diff --git a/doc/user/clusters/img/advanced-settings-cluster-management-project-v12_5.png b/doc/user/clusters/img/advanced-settings-cluster-management-project-v12_5.png Binary files differindex 63e2d1cd4e8..5fd1bac5e05 100644 --- a/doc/user/clusters/img/advanced-settings-cluster-management-project-v12_5.png +++ b/doc/user/clusters/img/advanced-settings-cluster-management-project-v12_5.png diff --git a/doc/user/clusters/img/cluster_environments_table_v12_3.png b/doc/user/clusters/img/cluster_environments_table_v12_3.png Binary files differindex 52f232e2eb3..9e419efe4c5 100644 --- a/doc/user/clusters/img/cluster_environments_table_v12_3.png +++ b/doc/user/clusters/img/cluster_environments_table_v12_3.png diff --git a/doc/user/discussions/img/make_suggestion.png b/doc/user/discussions/img/make_suggestion.png Binary files differindex a24e29770aa..f407ea730fb 100644 --- a/doc/user/discussions/img/make_suggestion.png +++ b/doc/user/discussions/img/make_suggestion.png diff --git a/doc/user/discussions/img/suggestion.png b/doc/user/discussions/img/suggestion.png Binary files differindex f7962305a15..4167f3b2aac 100644 --- a/doc/user/discussions/img/suggestion.png +++ b/doc/user/discussions/img/suggestion.png diff --git a/doc/user/group/epics/img/epics_list_view_v12.5.png b/doc/user/group/epics/img/epics_list_view_v12.5.png Binary files differindex 2520ee67abc..6e3c39009be 100644 --- a/doc/user/group/epics/img/epics_list_view_v12.5.png +++ b/doc/user/group/epics/img/epics_list_view_v12.5.png diff --git a/doc/user/group/img/select_group_dropdown.png b/doc/user/group/img/select_group_dropdown.png Binary files differindex 8c03ffffbde..4948cefb65f 100644 --- a/doc/user/group/img/select_group_dropdown.png +++ b/doc/user/group/img/select_group_dropdown.png diff --git a/doc/user/group/subgroups/img/group_members_filter_v12_6.png b/doc/user/group/subgroups/img/group_members_filter_v12_6.png Binary files differindex 0207515ded0..692fdfe00a1 100644 --- a/doc/user/group/subgroups/img/group_members_filter_v12_6.png +++ b/doc/user/group/subgroups/img/group_members_filter_v12_6.png diff --git a/doc/user/incident_management/img/incident_management_settings.png b/doc/user/incident_management/img/incident_management_settings.png Binary files differindex 25ad4fd08b7..761a782ce61 100644 --- a/doc/user/incident_management/img/incident_management_settings.png +++ b/doc/user/incident_management/img/incident_management_settings.png diff --git a/doc/user/instance_statistics/img/cohorts.png b/doc/user/instance_statistics/img/cohorts.png Binary files differindex 4d070fdb654..19250e385aa 100644 --- a/doc/user/instance_statistics/img/cohorts.png +++ b/doc/user/instance_statistics/img/cohorts.png diff --git a/doc/user/instance_statistics/img/dev_ops_score_v12_6.png b/doc/user/instance_statistics/img/dev_ops_score_v12_6.png Binary files differindex 7e956afb789..af07e9323d6 100644 --- a/doc/user/instance_statistics/img/dev_ops_score_v12_6.png +++ b/doc/user/instance_statistics/img/dev_ops_score_v12_6.png diff --git a/doc/user/instance_statistics/img/instance_statistics_button_v12_6.png b/doc/user/instance_statistics/img/instance_statistics_button_v12_6.png Binary files differindex b526577c215..e5f033141ca 100644 --- a/doc/user/instance_statistics/img/instance_statistics_button_v12_6.png +++ b/doc/user/instance_statistics/img/instance_statistics_button_v12_6.png diff --git a/doc/user/instance_statistics/index.md b/doc/user/instance_statistics/index.md index ac2e7e8f400..c31da8d86f1 100644 --- a/doc/user/instance_statistics/index.md +++ b/doc/user/instance_statistics/index.md @@ -5,7 +5,7 @@ in GitLab 11.2. Instance statistics gives users or admins access to instance-wide analytics. They are accessible to all users by default (GitLab admins can restrict its -visibility in the [admin area](../admin_area/settings/usage_statistics.md)), +visibility in the [Admin Area](../admin_area/settings/usage_statistics.md)), and can be accessed via the top bar.  diff --git a/doc/user/packages/conan_repository/img/conan_package_view.png b/doc/user/packages/conan_repository/img/conan_package_view.png Binary files differindex 79a188d7856..742fb4195da 100644 --- a/doc/user/packages/conan_repository/img/conan_package_view.png +++ b/doc/user/packages/conan_repository/img/conan_package_view.png diff --git a/doc/user/packages/dependency_proxy/img/group_dependency_proxy.png b/doc/user/packages/dependency_proxy/img/group_dependency_proxy.png Binary files differindex 42b412911f0..0b94efdd83e 100644 --- a/doc/user/packages/dependency_proxy/img/group_dependency_proxy.png +++ b/doc/user/packages/dependency_proxy/img/group_dependency_proxy.png diff --git a/doc/user/permissions.md b/doc/user/permissions.md index 9cbf4fd6192..2b26565018f 100644 --- a/doc/user/permissions.md +++ b/doc/user/permissions.md @@ -274,14 +274,14 @@ External users still count towards a license seat. An administrator can flag a user as external by either of the following methods: - Either [through the API](../api/users.md#user-modification). -- Or by navigating to the **Admin area > Overview > Users** to create a new user +- Or by navigating to the **Admin Area > Overview > Users** to create a new user or edit an existing one. There, you will find the option to flag the user as external. ### Setting new users to external By default, new users are not set as external users. This behavior can be changed -by an administrator under the **Admin Area > Settings > General > Account and limit** page. +by an administrator on the **Admin Area > Settings > General** page, under **Account and limit**. If you change the default behavior of creating new users as external, you will have the option to narrow it down by defining a set of internal users. diff --git a/doc/user/profile/account/create_accounts.md b/doc/user/profile/account/create_accounts.md index c0a887d0779..27aa57e7f99 100644 --- a/doc/user/profile/account/create_accounts.md +++ b/doc/user/profile/account/create_accounts.md @@ -15,7 +15,7 @@ If you have [sign-up enabled](../../admin_area/settings/sign_up_restrictions.md)  -## Create users in admin area +## Create users in Admin Area As an admin user, you can manually create users by: diff --git a/doc/user/profile/account/img/admin_user_button.png b/doc/user/profile/account/img/admin_user_button.png Binary files differindex 6be9c1e266a..506e16bb8ca 100644 --- a/doc/user/profile/account/img/admin_user_button.png +++ b/doc/user/profile/account/img/admin_user_button.png diff --git a/doc/user/profile/account/img/admin_user_form.png b/doc/user/profile/account/img/admin_user_form.png Binary files differindex ede96373c73..aebc31ee3ff 100644 --- a/doc/user/profile/account/img/admin_user_form.png +++ b/doc/user/profile/account/img/admin_user_form.png diff --git a/doc/user/profile/account/img/register_tab.png b/doc/user/profile/account/img/register_tab.png Binary files differindex 73faa3edd1c..4bbb4e62687 100644 --- a/doc/user/profile/account/img/register_tab.png +++ b/doc/user/profile/account/img/register_tab.png diff --git a/doc/user/project/img/code_owners_approval_new_protected_branch_v12_4.png b/doc/user/project/img/code_owners_approval_new_protected_branch_v12_4.png Binary files differindex f813b60dcd9..fc2893aa4d5 100644 --- a/doc/user/project/img/code_owners_approval_new_protected_branch_v12_4.png +++ b/doc/user/project/img/code_owners_approval_new_protected_branch_v12_4.png diff --git a/doc/user/project/img/description_templates_issue_settings.png b/doc/user/project/img/description_templates_issue_settings.png Binary files differindex 53328108835..657b6ae1269 100644 --- a/doc/user/project/img/description_templates_issue_settings.png +++ b/doc/user/project/img/description_templates_issue_settings.png diff --git a/doc/user/project/img/description_templates_merge_request_settings.png b/doc/user/project/img/description_templates_merge_request_settings.png Binary files differindex eda264f7f37..587367bf2fe 100644 --- a/doc/user/project/img/description_templates_merge_request_settings.png +++ b/doc/user/project/img/description_templates_merge_request_settings.png diff --git a/doc/user/project/img/issue_boards_multi_select.png b/doc/user/project/img/issue_boards_multi_select.png Binary files differindex 34ec0c1c58e..eebe06b04ae 100644 --- a/doc/user/project/img/issue_boards_multi_select.png +++ b/doc/user/project/img/issue_boards_multi_select.png diff --git a/doc/user/project/img/protected_branches_list_v12_3.png b/doc/user/project/img/protected_branches_list_v12_3.png Binary files differindex 2353ddd23be..995a294b85c 100644 --- a/doc/user/project/img/protected_branches_list_v12_3.png +++ b/doc/user/project/img/protected_branches_list_v12_3.png diff --git a/doc/user/project/img/protected_branches_page_v12_3.png b/doc/user/project/img/protected_branches_page_v12_3.png Binary files differindex 9a194c85c41..60aa3c4d251 100644 --- a/doc/user/project/img/protected_branches_page_v12_3.png +++ b/doc/user/project/img/protected_branches_page_v12_3.png diff --git a/doc/user/project/img/service_desk_enabled.png b/doc/user/project/img/service_desk_enabled.png Binary files differindex 4261fde3a6e..33d51227e5f 100644 --- a/doc/user/project/img/service_desk_enabled.png +++ b/doc/user/project/img/service_desk_enabled.png diff --git a/doc/user/project/img/service_desk_nav_item.png b/doc/user/project/img/service_desk_nav_item.png Binary files differindex e8f1cedb793..fdf8fa024c3 100644 --- a/doc/user/project/img/service_desk_nav_item.png +++ b/doc/user/project/img/service_desk_nav_item.png diff --git a/doc/user/project/import/img/bitbucket_import_select_project_v12_3.png b/doc/user/project/import/img/bitbucket_import_select_project_v12_3.png Binary files differindex 1f1febd9068..bbc72a0b4b7 100644 --- a/doc/user/project/import/img/bitbucket_import_select_project_v12_3.png +++ b/doc/user/project/import/img/bitbucket_import_select_project_v12_3.png diff --git a/doc/user/project/import/img/bitbucket_server_import_select_project_v12_3.png b/doc/user/project/import/img/bitbucket_server_import_select_project_v12_3.png Binary files differindex 1c344853cc8..3f94dd83dd6 100644 --- a/doc/user/project/import/img/bitbucket_server_import_select_project_v12_3.png +++ b/doc/user/project/import/img/bitbucket_server_import_select_project_v12_3.png diff --git a/doc/user/project/import/img/gitlab_new_project_page_v12_2.png b/doc/user/project/import/img/gitlab_new_project_page_v12_2.png Binary files differindex e79c27f32c0..ff6e5dbf4a1 100644 --- a/doc/user/project/import/img/gitlab_new_project_page_v12_2.png +++ b/doc/user/project/import/img/gitlab_new_project_page_v12_2.png diff --git a/doc/user/project/import/img/import_projects_from_gitea_importer_v12_3.png b/doc/user/project/import/img/import_projects_from_gitea_importer_v12_3.png Binary files differindex d8ae1a54851..0f99f74871b 100644 --- a/doc/user/project/import/img/import_projects_from_gitea_importer_v12_3.png +++ b/doc/user/project/import/img/import_projects_from_gitea_importer_v12_3.png diff --git a/doc/user/project/import/img/import_projects_from_github_importer_v12_3.png b/doc/user/project/import/img/import_projects_from_github_importer_v12_3.png Binary files differindex 6a53d9e6d1d..3ac03c0ecc5 100644 --- a/doc/user/project/import/img/import_projects_from_github_importer_v12_3.png +++ b/doc/user/project/import/img/import_projects_from_github_importer_v12_3.png diff --git a/doc/user/project/import/img/import_projects_from_repo_url.png b/doc/user/project/import/img/import_projects_from_repo_url.png Binary files differindex 90bcff5d31b..fd3eae98ebf 100644 --- a/doc/user/project/import/img/import_projects_from_repo_url.png +++ b/doc/user/project/import/img/import_projects_from_repo_url.png diff --git a/doc/user/project/import/phabricator.md b/doc/user/project/import/phabricator.md index 5015c5390de..46438c81d35 100644 --- a/doc/user/project/import/phabricator.md +++ b/doc/user/project/import/phabricator.md @@ -32,4 +32,4 @@ we can gain early feedback before releasing it for everyone. To enable it: Feature.enable(:phabricator_import) ``` -1. Enable Phabricator as an [import source](../../admin_area/settings/visibility_and_access_controls.md#import-sources) in the Admin area. +1. Enable Phabricator as an [import source](../../admin_area/settings/visibility_and_access_controls.md#import-sources) in the Admin Area. diff --git a/doc/user/project/integrations/img/emails_on_push_service.png b/doc/user/project/integrations/img/emails_on_push_service.png Binary files differindex 36a24df4d0f..43cef167369 100644 --- a/doc/user/project/integrations/img/emails_on_push_service.png +++ b/doc/user/project/integrations/img/emails_on_push_service.png diff --git a/doc/user/project/integrations/img/embed_metrics_issue_template.png b/doc/user/project/integrations/img/embed_metrics_issue_template.png Binary files differindex 3c6a243e5c1..ca39a738d5f 100644 --- a/doc/user/project/integrations/img/embed_metrics_issue_template.png +++ b/doc/user/project/integrations/img/embed_metrics_issue_template.png diff --git a/doc/user/project/integrations/img/hangouts_chat_configuration.png b/doc/user/project/integrations/img/hangouts_chat_configuration.png Binary files differindex c40c9b92edb..1104f20ce2f 100644 --- a/doc/user/project/integrations/img/hangouts_chat_configuration.png +++ b/doc/user/project/integrations/img/hangouts_chat_configuration.png diff --git a/doc/user/project/integrations/img/mattermost_configuration.png b/doc/user/project/integrations/img/mattermost_configuration.png Binary files differindex d196b1fc8e4..18c0036846d 100644 --- a/doc/user/project/integrations/img/mattermost_configuration.png +++ b/doc/user/project/integrations/img/mattermost_configuration.png diff --git a/doc/user/project/integrations/img/microsoft_teams_configuration.png b/doc/user/project/integrations/img/microsoft_teams_configuration.png Binary files differindex 8794991f2ec..22ad28e3f73 100644 --- a/doc/user/project/integrations/img/microsoft_teams_configuration.png +++ b/doc/user/project/integrations/img/microsoft_teams_configuration.png diff --git a/doc/user/project/integrations/img/slack_configuration.png b/doc/user/project/integrations/img/slack_configuration.png Binary files differindex 6922c70f253..4d5e6ae7856 100644 --- a/doc/user/project/integrations/img/slack_configuration.png +++ b/doc/user/project/integrations/img/slack_configuration.png diff --git a/doc/user/project/integrations/img/unify_circuit_configuration.png b/doc/user/project/integrations/img/unify_circuit_configuration.png Binary files differindex 285d4f92030..adba065347f 100644 --- a/doc/user/project/integrations/img/unify_circuit_configuration.png +++ b/doc/user/project/integrations/img/unify_circuit_configuration.png diff --git a/doc/user/project/integrations/services_templates.md b/doc/user/project/integrations/services_templates.md index a0bf31c526f..8a88df88629 100644 --- a/doc/user/project/integrations/services_templates.md +++ b/doc/user/project/integrations/services_templates.md @@ -8,8 +8,8 @@ for new projects only. ## Enable a service template -In GitLab's Admin area, navigate to **Service Templates** and choose the -service template you wish to create. +Navigate to the **Admin Area > Service Templates** and choose the service +template you wish to create. ## Services for external issue trackers diff --git a/doc/user/project/issues/img/confirm_design_deletion_v12_4.png b/doc/user/project/issues/img/confirm_design_deletion_v12_4.png Binary files differindex b1a55c639ca..447d3907122 100644 --- a/doc/user/project/issues/img/confirm_design_deletion_v12_4.png +++ b/doc/user/project/issues/img/confirm_design_deletion_v12_4.png diff --git a/doc/user/project/issues/img/delete_multiple_designs_v12_4.png b/doc/user/project/issues/img/delete_multiple_designs_v12_4.png Binary files differindex b421a5577df..75cbdf77c24 100644 --- a/doc/user/project/issues/img/delete_multiple_designs_v12_4.png +++ b/doc/user/project/issues/img/delete_multiple_designs_v12_4.png diff --git a/doc/user/project/issues/img/delete_single_design_v12_4.png b/doc/user/project/issues/img/delete_single_design_v12_4.png Binary files differindex 0ca03b48e76..158b4949ce4 100644 --- a/doc/user/project/issues/img/delete_single_design_v12_4.png +++ b/doc/user/project/issues/img/delete_single_design_v12_4.png diff --git a/doc/user/project/issues/img/disable_issue_auto_close.png b/doc/user/project/issues/img/disable_issue_auto_close.png Binary files differindex 2cf48a92331..5894d39622a 100644 --- a/doc/user/project/issues/img/disable_issue_auto_close.png +++ b/doc/user/project/issues/img/disable_issue_auto_close.png diff --git a/doc/user/project/issues/img/select_designs_v12_4.png b/doc/user/project/issues/img/select_designs_v12_4.png Binary files differindex a53bd516300..532a79fce65 100644 --- a/doc/user/project/issues/img/select_designs_v12_4.png +++ b/doc/user/project/issues/img/select_designs_v12_4.png diff --git a/doc/user/project/issues/img/zoom-quickaction-button.png b/doc/user/project/issues/img/zoom-quickaction-button.png Binary files differindex c95a56b43e8..3be4f36f88f 100644 --- a/doc/user/project/issues/img/zoom-quickaction-button.png +++ b/doc/user/project/issues/img/zoom-quickaction-button.png diff --git a/doc/user/project/members/img/project_members.png b/doc/user/project/members/img/project_members.png Binary files differindex 5d44b5d957e..218f5a24d2e 100644 --- a/doc/user/project/members/img/project_members.png +++ b/doc/user/project/members/img/project_members.png diff --git a/doc/user/project/members/img/project_members_filter_v12_6.png b/doc/user/project/members/img/project_members_filter_v12_6.png Binary files differindex 0207515ded0..692fdfe00a1 100644 --- a/doc/user/project/members/img/project_members_filter_v12_6.png +++ b/doc/user/project/members/img/project_members_filter_v12_6.png diff --git a/doc/user/project/merge_requests/img/create_merge_request_button_v12_6.png b/doc/user/project/merge_requests/img/create_merge_request_button_v12_6.png Binary files differindex e0a8af76be9..bcbee10e1b7 100644 --- a/doc/user/project/merge_requests/img/create_merge_request_button_v12_6.png +++ b/doc/user/project/merge_requests/img/create_merge_request_button_v12_6.png diff --git a/doc/user/project/merge_requests/img/dependencies_edit_inaccessible_v12_4.png b/doc/user/project/merge_requests/img/dependencies_edit_inaccessible_v12_4.png Binary files differindex 3699ffd16b4..5ced2fa812f 100644 --- a/doc/user/project/merge_requests/img/dependencies_edit_inaccessible_v12_4.png +++ b/doc/user/project/merge_requests/img/dependencies_edit_inaccessible_v12_4.png diff --git a/doc/user/project/merge_requests/img/dependencies_edit_v12_4.png b/doc/user/project/merge_requests/img/dependencies_edit_v12_4.png Binary files differindex beb452e80cf..4edf0648794 100644 --- a/doc/user/project/merge_requests/img/dependencies_edit_v12_4.png +++ b/doc/user/project/merge_requests/img/dependencies_edit_v12_4.png diff --git a/doc/user/project/merge_requests/img/dependencies_view_v12_2.png b/doc/user/project/merge_requests/img/dependencies_view_v12_2.png Binary files differindex e00231c839b..3dde15292c4 100644 --- a/doc/user/project/merge_requests/img/dependencies_view_v12_2.png +++ b/doc/user/project/merge_requests/img/dependencies_view_v12_2.png diff --git a/doc/user/project/merge_requests/img/incrementally_expand_merge_request_diffs_v12_2.png b/doc/user/project/merge_requests/img/incrementally_expand_merge_request_diffs_v12_2.png Binary files differindex ee94dbdea5c..e3a2ff7960c 100644 --- a/doc/user/project/merge_requests/img/incrementally_expand_merge_request_diffs_v12_2.png +++ b/doc/user/project/merge_requests/img/incrementally_expand_merge_request_diffs_v12_2.png diff --git a/doc/user/project/merge_requests/img/merge_request_diff_v12_2.png b/doc/user/project/merge_requests/img/merge_request_diff_v12_2.png Binary files differindex e56fbb9750f..7e23b7db309 100644 --- a/doc/user/project/merge_requests/img/merge_request_diff_v12_2.png +++ b/doc/user/project/merge_requests/img/merge_request_diff_v12_2.png diff --git a/doc/user/project/merge_requests/img/new_merge_request_page_v12_6.png b/doc/user/project/merge_requests/img/new_merge_request_page_v12_6.png Binary files differindex 9653d33cbff..c0f2ba261cb 100644 --- a/doc/user/project/merge_requests/img/new_merge_request_page_v12_6.png +++ b/doc/user/project/merge_requests/img/new_merge_request_page_v12_6.png diff --git a/doc/user/project/operations/img/error_details_v12_5.png b/doc/user/project/operations/img/error_details_v12_5.png Binary files differindex 5e3e6300640..f4866141948 100644 --- a/doc/user/project/operations/img/error_details_v12_5.png +++ b/doc/user/project/operations/img/error_details_v12_5.png diff --git a/doc/user/project/operations/img/error_details_v12_6.png b/doc/user/project/operations/img/error_details_v12_6.png Binary files differindex b9152bd2c11..3194d8284d7 100644 --- a/doc/user/project/operations/img/error_details_v12_6.png +++ b/doc/user/project/operations/img/error_details_v12_6.png diff --git a/doc/user/project/releases/img/custom_notifications_dropdown_v12_5.png b/doc/user/project/releases/img/custom_notifications_dropdown_v12_5.png Binary files differindex 0d5a8807d4a..879599a71f5 100644 --- a/doc/user/project/releases/img/custom_notifications_dropdown_v12_5.png +++ b/doc/user/project/releases/img/custom_notifications_dropdown_v12_5.png diff --git a/doc/user/project/releases/img/custom_notifications_new_release_v12_5.png b/doc/user/project/releases/img/custom_notifications_new_release_v12_5.png Binary files differindex 61af62ca460..d136aa710b2 100644 --- a/doc/user/project/releases/img/custom_notifications_new_release_v12_5.png +++ b/doc/user/project/releases/img/custom_notifications_new_release_v12_5.png diff --git a/doc/user/project/releases/img/edit_release_page_v12_6.png b/doc/user/project/releases/img/edit_release_page_v12_6.png Binary files differindex 8b9c502a2ef..ae7641ac8a5 100644 --- a/doc/user/project/releases/img/edit_release_page_v12_6.png +++ b/doc/user/project/releases/img/edit_release_page_v12_6.png diff --git a/doc/user/project/releases/img/release_edit_button_v12_6.png b/doc/user/project/releases/img/release_edit_button_v12_6.png Binary files differindex f60b0ecb1be..8cc080621cf 100644 --- a/doc/user/project/releases/img/release_edit_button_v12_6.png +++ b/doc/user/project/releases/img/release_edit_button_v12_6.png diff --git a/doc/user/project/repository/img/file_blame_button_v12_6.png b/doc/user/project/repository/img/file_blame_button_v12_6.png Binary files differindex b5a18e6726f..e7aa0d1ea3f 100644 --- a/doc/user/project/repository/img/file_blame_button_v12_6.png +++ b/doc/user/project/repository/img/file_blame_button_v12_6.png diff --git a/doc/user/project/repository/img/file_blame_output_v12_6.png b/doc/user/project/repository/img/file_blame_output_v12_6.png Binary files differindex 4aca40353d5..c1186429917 100644 --- a/doc/user/project/repository/img/file_blame_output_v12_6.png +++ b/doc/user/project/repository/img/file_blame_output_v12_6.png diff --git a/doc/user/project/repository/img/file_blame_previous_commit_v12_7.png b/doc/user/project/repository/img/file_blame_previous_commit_v12_7.png Binary files differindex 3029f42c3c4..2da9e28c84f 100644 --- a/doc/user/project/repository/img/file_blame_previous_commit_v12_7.png +++ b/doc/user/project/repository/img/file_blame_previous_commit_v12_7.png diff --git a/doc/user/project/repository/img/file_history_button_v12_6.png b/doc/user/project/repository/img/file_history_button_v12_6.png Binary files differindex b5a18e6726f..e7aa0d1ea3f 100644 --- a/doc/user/project/repository/img/file_history_button_v12_6.png +++ b/doc/user/project/repository/img/file_history_button_v12_6.png diff --git a/doc/user/project/repository/img/file_history_output_v12_6.png b/doc/user/project/repository/img/file_history_output_v12_6.png Binary files differindex 9e9855203af..1a84f347a93 100644 --- a/doc/user/project/repository/img/file_history_output_v12_6.png +++ b/doc/user/project/repository/img/file_history_output_v12_6.png diff --git a/doc/user/project/repository/img/repository_mirroring_push_settings.png b/doc/user/project/repository/img/repository_mirroring_push_settings.png Binary files differindex 3c0eacaa2df..d055cc580c4 100644 --- a/doc/user/project/repository/img/repository_mirroring_push_settings.png +++ b/doc/user/project/repository/img/repository_mirroring_push_settings.png diff --git a/doc/user/project/repository/img/web_editor_new_branch_from_issue_create_button_v12_6.png b/doc/user/project/repository/img/web_editor_new_branch_from_issue_create_button_v12_6.png Binary files differindex f40cc187b46..1ef210240d4 100644 --- a/doc/user/project/repository/img/web_editor_new_branch_from_issue_create_button_v12_6.png +++ b/doc/user/project/repository/img/web_editor_new_branch_from_issue_create_button_v12_6.png diff --git a/doc/user/project/repository/img/web_editor_new_branch_from_issue_v_12_6.png b/doc/user/project/repository/img/web_editor_new_branch_from_issue_v_12_6.png Binary files differindex d5a92546d40..02cadd5de4c 100644 --- a/doc/user/project/repository/img/web_editor_new_branch_from_issue_v_12_6.png +++ b/doc/user/project/repository/img/web_editor_new_branch_from_issue_v_12_6.png diff --git a/doc/user/project/web_ide/img/commit_changes_v12_3.png b/doc/user/project/web_ide/img/commit_changes_v12_3.png Binary files differindex 0ee7da26d1a..e7dffbc7655 100644 --- a/doc/user/project/web_ide/img/commit_changes_v12_3.png +++ b/doc/user/project/web_ide/img/commit_changes_v12_3.png diff --git a/doc/user/project/web_ide/img/review_changes_v12_3.png b/doc/user/project/web_ide/img/review_changes_v12_3.png Binary files differindex cbc96e3dcd9..cd13e5d9e8e 100644 --- a/doc/user/project/web_ide/img/review_changes_v12_3.png +++ b/doc/user/project/web_ide/img/review_changes_v12_3.png diff --git a/doc/user/search/img/issue_search_filter_v12_7.png b/doc/user/search/img/issue_search_filter_v12_7.png Binary files differindex 8a4d0165cb6..102a2e0859c 100644 --- a/doc/user/search/img/issue_search_filter_v12_7.png +++ b/doc/user/search/img/issue_search_filter_v12_7.png diff --git a/lib/tasks/pngquant.rake b/lib/tasks/pngquant.rake index 0197cc9dbcf..56dfd5ed081 100644 --- a/lib/tasks/pngquant.rake +++ b/lib/tasks/pngquant.rake @@ -5,7 +5,7 @@ require 'parallel' # The amount of variance (in bytes) allowed in # file size when testing for compression size -TOLERANCE = 10 +TOLERANCE = 10000 namespace :pngquant do # Returns an array of all images eligible for compression diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 56771654526..f06a19b6321 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -8288,6 +8288,9 @@ msgstr "" msgid "GeoNodes|Node Authentication was successfully repaired." msgstr "" +msgid "GeoNodes|Node URL" +msgstr "" + msgid "GeoNodes|Node was successfully removed." msgstr "" diff --git a/spec/services/clusters/aws/provision_service_spec.rb b/spec/services/clusters/aws/provision_service_spec.rb index 927ffaef002..15571c64e13 100644 --- a/spec/services/clusters/aws/provision_service_spec.rb +++ b/spec/services/clusters/aws/provision_service_spec.rb @@ -35,7 +35,7 @@ describe Clusters::Aws::ProvisionService do before do allow(Clusters::Aws::FetchCredentialsService).to receive(:new) - .with(provision_role, provider: provider, region: provider.region) + .with(provision_role, provider: provider) .and_return(double(execute: credentials)) allow(provider).to receive(:api_client) |
