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 fd9664259200184a45f191663ebca9b2efdf891b..593de1dcee7207e390cebf3dd848303e1e925b65 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 70d66f3f96d118bc440ee12a8d63f970d8469b66..9a8672a7adac836a583542f9447e835c235f8a1c 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 f61ff4734b478f2d936047689aa2686839bad7ae..c624de8b0096825a0ca4fd8f464b0ee1a5a2ce49 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 cb2a98b553f77f4d46b02db4a2f5d58732364598..efb1957d5e777dcdb3449e0abf12e0d4bc448057 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 d999b706d6c4c7679d4f4a9963584ee7d554cf8a..829b305d1ee904fb2de46338aff85855e20e0ec0 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 de56e843eb91f8eb094deab83ed9875d62aad996..019027be6c6a3a70f224c6f3bb4e3c61eeb9b411 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 82f77d2bb19270b90a0fd792a75fcc04835cebf4..158497b1fef6251a166cbc10d0468a83dc093715 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