From 71416b56f684e23faaaa65f605ae49cffaa35491 Mon Sep 17 00:00:00 2001
From: Suzanne Selhorn <sselhorn@gitlab.com>
Date: Mon, 24 Jul 2023 20:23:37 +0000
Subject: [PATCH] Changed user/admin to administration path
Related to: https://gitlab.com/gitlab-org/gitlab/-/issues/384335
---
.../analytics/devops_reports/components/devops_score.vue | 2 +-
config/README.md | 2 +-
ee/app/views/projects/security/policies/readme.md.tt | 2 +-
.../database/migrations/batched_background_migration_helpers.rb | 2 +-
lib/gitlab/rack_attack.rb | 2 +-
.../analytics/devops_score/components/devops_score_spec.js | 2 +-
.../migrations/batched_background_migration_helpers_spec.rb | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/assets/javascripts/analytics/devops_reports/components/devops_score.vue b/app/assets/javascripts/analytics/devops_reports/components/devops_score.vue
index fd96642592001..593de1dcee720 100644
--- a/app/assets/javascripts/analytics/devops_reports/components/devops_score.vue
+++ b/app/assets/javascripts/analytics/devops_reports/components/devops_score.vue
@@ -40,7 +40,7 @@ export default {
return this.devopsScoreMetrics.averageScore === undefined;
},
},
- devopsReportDocsPath: helpPagePath('user/admin_area/analytics/dev_ops_reports'),
+ devopsReportDocsPath: helpPagePath('administration/analytics/dev_ops_reports'),
tableHeaderFields: [
{
key: 'title',
diff --git a/config/README.md b/config/README.md
index 70d66f3f96d11..9a8672a7adac8 100644
--- a/config/README.md
+++ b/config/README.md
@@ -73,7 +73,7 @@ An example configuration file for Redis is in this directory under the name
| `queues` | | Background job processing queues |
| `shared_state` | | Persistent application state |
| `trace_chunks` | `shared_state` | [CI trace chunks](https://docs.gitlab.com/ee/administration/job_logs.html#incremental-logging-architecture) |
-| `rate_limiting` | `cache` | [Rate limiting](https://docs.gitlab.com/ee/user/admin_area/settings/user_and_ip_rate_limits.html) state |
+| `rate_limiting` | `cache` | [Rate limiting](https://docs.gitlab.com/ee/administration/settings/user_and_ip_rate_limits.html) state |
| `sessions` | `shared_state` | [Sessions](https://docs.gitlab.com/ee/development/session.html#redis) |
| `repository_cache` | `cache` | Repository related information |
| `db_load_balancing` | `shared_state` | [Database Load Balancing](https://docs.gitlab.com/ee/administration/postgresql/database_load_balancing.html) |
diff --git a/ee/app/views/projects/security/policies/readme.md.tt b/ee/app/views/projects/security/policies/readme.md.tt
index f61ff4734b478..c624de8b00968 100644
--- a/ee/app/views/projects/security/policies/readme.md.tt
+++ b/ee/app/views/projects/security/policies/readme.md.tt
@@ -38,4 +38,4 @@ You can read more about the format and policies schema in the [documentation](ht
This project is preconfigured with the default branch set as a protected branch, and only maintainers/owners of
[<%= @container.name %>](<%= @container.web_url %>) have permission to merge into that branch. This overrides any default branch protection both at the
[group level](https://docs.gitlab.com/ee/user/group/manage.html#change-the-default-branch-protection-of-a-group) and at the
-[instance level](https://docs.gitlab.com/ee/user/admin_area/settings/visibility_and_access_controls.html#default-branch-protection).
+[instance level](https://docs.gitlab.com/ee/administration/settings/visibility_and_access_controls.html#default-branch-protection).
diff --git a/lib/gitlab/database/migrations/batched_background_migration_helpers.rb b/lib/gitlab/database/migrations/batched_background_migration_helpers.rb
index cb2a98b553f77..efb1957d5e777 100644
--- a/lib/gitlab/database/migrations/batched_background_migration_helpers.rb
+++ b/lib/gitlab/database/migrations/batched_background_migration_helpers.rb
@@ -242,7 +242,7 @@ def ensure_batched_background_migration_is_finished(job_class_name:, table_name:
"\n\n" \
"For more information, check the documentation" \
"\n\n" \
- "\thttps://docs.gitlab.com/ee/user/admin_area/monitoring/background_migrations.html#database-migrations-failing-because-of-batched-background-migration-not-finished"
+ "\thttps://docs.gitlab.com/ee/update/background_migrations.html#database-migrations-failing-because-of-batched-background-migration-not-finished"
end
end
end
diff --git a/lib/gitlab/rack_attack.rb b/lib/gitlab/rack_attack.rb
index d999b706d6c4c..829b305d1ee90 100644
--- a/lib/gitlab/rack_attack.rb
+++ b/lib/gitlab/rack_attack.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
# When adding new user-configurable throttles, remember to update the documentation
-# in doc/user/admin_area/settings/user_and_ip_rate_limits.md
+# in doc/administration/settings/user_and_ip_rate_limits.md
#
# Integration specs for throttling can be found in:
# spec/requests/rack_attack_global_spec.rb
diff --git a/spec/frontend/admin/analytics/devops_score/components/devops_score_spec.js b/spec/frontend/admin/analytics/devops_score/components/devops_score_spec.js
index de56e843eb91f..019027be6c6a3 100644
--- a/spec/frontend/admin/analytics/devops_score/components/devops_score_spec.js
+++ b/spec/frontend/admin/analytics/devops_score/components/devops_score_spec.js
@@ -52,7 +52,7 @@ describe('DevopsScore', () => {
it('contains a link to the feature documentation', () => {
expect(findDocsLink().exists()).toBe(true);
expect(findDocsLink().attributes('href')).toBe(
- '/help/user/admin_area/analytics/dev_ops_reports',
+ '/help/administration/analytics/dev_ops_reports',
);
});
});
diff --git a/spec/lib/gitlab/database/migrations/batched_background_migration_helpers_spec.rb b/spec/lib/gitlab/database/migrations/batched_background_migration_helpers_spec.rb
index 82f77d2bb1927..158497b1fef62 100644
--- a/spec/lib/gitlab/database/migrations/batched_background_migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migrations/batched_background_migration_helpers_spec.rb
@@ -473,7 +473,7 @@ def self.name
"\n\n" \
"For more information, check the documentation" \
"\n\n" \
- "\thttps://docs.gitlab.com/ee/user/admin_area/monitoring/background_migrations.html#database-migrations-failing-because-of-batched-background-migration-not-finished"
+ "\thttps://docs.gitlab.com/ee/update/background_migrations.html#database-migrations-failing-because-of-batched-background-migration-not-finished"
end
it 'does not raise error when migration exists and is marked as finished' do
--
GitLab