Skip to content

Commit b01e8ff

Browse files
axilleasSuzanne Selhorn
andcommitted
Merge branch 'docs-admin-path-update' into 'master'
Changed user/admin to administration path See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7054 Merged-by: Achilleas Pipinellis <[email protected]> Approved-by: Achilleas Pipinellis <[email protected]> Co-authored-by: Suzanne Selhorn <[email protected]>
2 parents 12c44b5 + b121465 commit b01e8ff

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

doc/jihu_edition.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ back to the login screen. Use the default account's username `root` to log in.
4444
For detailed instructions, see [installation and configuration](installation/index.md#installation-and-configuration).
4545

4646
Additionally, you can navigate to the GitLab administration panel of your server and
47-
[upload your JiHu Edition license file](https://docs.gitlab.com/ee/user/admin_area/license.html#uploading-your-license).
47+
[upload your JiHu Edition license file](https://docs.gitlab.com/ee/administration/license.html#uploading-your-license).
4848

4949
## Update GitLab Enterprise Edition to JiHu Edition
5050

doc/roles/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ information, see the
185185
186186
Spamcheck roles are used to setup and configure Spamcheck services. For additional
187187
information, see the
188-
[Spamcheck documentation](https://docs.gitlab.com/ee/user/admin_area/reporting/spamcheck.html)
188+
[Spamcheck documentation](https://docs.gitlab.com/ee/administration/reporting/spamcheck.html)
189189

190190
- **spamcheck_role** (`gitlab-ee`)
191191

doc/settings/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ for more details about the use of DNS in a self-managed GitLab instance.
2626
To change the external URL:
2727

2828
1. Optional. Before you change the external URL, determine if you have previously
29-
defined a [custom **Home page URL** or **After sign-out path**](https://docs.gitlab.com/ee/user/admin_area/settings/sign_in_restrictions.html#sign-in-information).
29+
defined a [custom **Home page URL** or **After sign-out path**](https://docs.gitlab.com/ee/administration/settings/sign_in_restrictions.html#sign-in-information).
3030
Both of these settings might cause unintentional redirecting after configuring
3131
a new external URL. If you have defined any URLs, remove them completely.
3232

doc/settings/nginx.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ sudo gitlab-ctl hup nginx
707707

708708
If you see `Request Entity Too Large` in the [NGINX logs](https://docs.gitlab.com/ee/administration/logs/index.html#nginx-logs),
709709
you will need to increase the [Client Max Body Size](http://nginx.org/en/docs/http/ngx_http_core_module.html#client_max_body_size).
710-
You may encounter this error if you have increased the [Max import size](https://docs.gitlab.com/ee/user/admin_area/settings/account_and_limit_settings.html#max-import-size).
710+
You may encounter this error if you have increased the [Max import size](https://docs.gitlab.com/ee/administration/settings/account_and_limit_settings.html#max-import-size).
711711
In a Kubernetes-based GitLab installation, this setting is
712712
[named differently](https://docs.gitlab.com/charts/charts/gitlab/webservice/#proxybodysize).
713713

doc/settings/ssl/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ The external load balancer may need access to a GitLab endpoint
394394
that returns a `200` status code (for installations requiring login, the root
395395
page returns a `302` redirect to the login page). In that case, it's
396396
recommended to leverage a
397-
[health check endpoint](https://docs.gitlab.com/ee/user/admin_area/monitoring/health_check.html).
397+
[health check endpoint](https://docs.gitlab.com/ee/administration/monitoring/health_check.html).
398398

399399
Other bundled components, like the Container Registry, GitLab Pages, or Mattermost,
400400
use a similar strategy for proxied SSL. Set the particular component's `*_external_url` with `https://` and

doc/update/gitlab_11_changes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ been removed:
6464

6565
### 11.2
6666

67-
Rack Attack is disabled by default. To continue using Rack Attack, you must [enable it manually](https://docs.gitlab.com/ee/user/admin_area/settings/protected_paths.html).
67+
Rack Attack is disabled by default. To continue using Rack Attack, you must [enable it manually](https://docs.gitlab.com/ee/administration/settings/protected_paths.html).
6868

6969
### 11.3
7070

files/gitlab-cookbooks/package/libraries/deprecations.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ def list(existing_config = nil)
330330
config_keys: %w(gitlab gitlab_rails gitlab_default_can_create_group),
331331
deprecation: '15.5',
332332
removal: '16.0',
333-
note: "Starting with GitLab 15.5, this setting cannot be controlled via the configuration file anymore. Follow the steps at https://docs.gitlab.com/ee/user/admin_area/settings/account_and_limit_settings.html#prevent-new-users-from-creating-top-level-groups, to configure this setting via the Admin UI or the API"
333+
note: "Starting with GitLab 15.5, this setting cannot be controlled via the configuration file anymore. Follow the steps at https://docs.gitlab.com/ee/administration/settings/account_and_limit_settings.html#prevent-new-users-from-creating-top-level-groups, to configure this setting via the Admin UI or the API"
334334
},
335335
{
336336
config_keys: %w(gitlab sidekiq queue_selector),

0 commit comments

Comments
 (0)