diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS index 20780999698..94c485ada9d 100644 --- a/.gitlab/CODEOWNERS +++ b/.gitlab/CODEOWNERS @@ -509,8 +509,6 @@ lib/gitlab/checks/** /doc/administration/monitoring/performance/ @jglassman1 /doc/administration/monitoring/prometheus/gitlab_exporter.md @jglassman1 /doc/administration/monitoring/prometheus/index.md @axil -/doc/administration/monitoring/prometheus/pgbouncer_exporter.md @aqualls -/doc/administration/monitoring/prometheus/postgres_exporter.md @aqualls /doc/administration/monitoring/prometheus/registry_exporter.md @phillipwells /doc/administration/monitoring/prometheus/web_exporter.md @jglassman1 /doc/administration/nfs.md @axil @@ -523,8 +521,7 @@ lib/gitlab/checks/** /doc/administration/packages/ @marcel.amirault /doc/administration/packages/index.md @phillipwells /doc/administration/polling.md @axil -/doc/administration/postgresql/ @aqualls -/doc/administration/postgresql/multiple_databases.md @lciutacu +/doc/administration/postgresql/ @lciutacu /doc/administration/raketasks/ @axil /doc/administration/raketasks/ldap.md @jglassman1 /doc/administration/raketasks/praefect.md @eread @@ -552,6 +549,7 @@ lib/gitlab/checks/** /doc/administration/settings/import_export_rate_limits.md @eread @ashrafkhamis /doc/administration/settings/instance_template_repository.md @msedlakjakubowski /doc/administration/settings/jira_cloud_app.md @eread @ashrafkhamis +/doc/administration/settings/jira_cloud_app_troubleshooting.md @eread @ashrafkhamis /doc/administration/settings/package_registry_rate_limits.md @phillipwells /doc/administration/settings/project_integration_management.md @eread @ashrafkhamis /doc/administration/settings/push_event_activities_limit.md @msedlakjakubowski @@ -563,6 +561,7 @@ lib/gitlab/checks/** /doc/administration/settings/rate_limits_on_git_ssh_operations.md @msedlakjakubowski /doc/administration/settings/scim_setup.md @jglassman1 /doc/administration/settings/security_and_compliance.md @rdickenson +/doc/administration/settings/security_contact_information.md @eread /doc/administration/settings/slack_app.md @eread @ashrafkhamis /doc/administration/settings/terraform_limits.md @phillipwells /doc/administration/settings/third_party_offers.md @lciutacu @@ -577,7 +576,6 @@ lib/gitlab/checks/** /doc/administration/terraform_state.md @phillipwells /doc/administration/timezone.md @axil /doc/administration/troubleshooting/ @axil -/doc/administration/troubleshooting/postgresql.md @aqualls /doc/administration/uploads.md @axil /doc/administration/user_settings.md @jglassman1 /doc/api/access_requests.md @jglassman1 @@ -595,7 +593,6 @@ lib/gitlab/checks/** /doc/api/commits.md @msedlakjakubowski /doc/api/container_registry.md @marcel.amirault /doc/api/custom_attributes.md @msedlakjakubowski -/doc/api/database_migrations.md @aqualls /doc/api/dependencies.md @rdickenson /doc/api/dependency_list_export.md @rdickenson /doc/api/dependency_proxy.md @marcel.amirault @@ -740,8 +737,6 @@ lib/gitlab/checks/** /doc/api/vulnerability_findings.md @rdickenson /doc/architecture/blueprints/cells/ @lciutacu /doc/architecture/blueprints/ci_builds_runner_fleet_metrics/ @fneill -/doc/architecture/blueprints/database/scalability/patterns/ @aqualls -/doc/architecture/blueprints/database_scaling/ @aqualls /doc/architecture/blueprints/google_artifact_registry_integration/ @marcel.amirault /doc/architecture/blueprints/organization/ @lciutacu /doc/ci/ @marcel.amirault @lyspin @@ -806,7 +801,6 @@ lib/gitlab/checks/** /doc/editor_extensions/ @aqualls /doc/gitlab-basics/ @msedlakjakubowski /doc/install/ @axil -/doc/install/postgresql_extensions.md @aqualls /doc/integration/ @jglassman1 /doc/integration/advanced_search/ @ashrafkhamis /doc/integration/akismet.md @phillipwells @@ -860,7 +854,6 @@ lib/gitlab/checks/** /doc/tutorials/update_commit_messages/ @msedlakjakubowski /doc/tutorials/website_project_with_analytics/ @lciutacu /doc/update/ @axil -/doc/update/background_migrations.md @aqualls /doc/user/ai_features.md @sselhorn /doc/user/analytics/ @lciutacu /doc/user/analytics/ci_cd_analytics.md @phillipwells @@ -875,13 +868,19 @@ lib/gitlab/checks/** /doc/user/emoji_reactions.md @msedlakjakubowski /doc/user/enterprise_user/ @jglassman1 /doc/user/gitlab_duo_chat.md @sselhorn -/doc/user/group/ @lciutacu +/doc/user/group/access_and_permissions.md @lciutacu /doc/user/group/clusters/ @phillipwells /doc/user/group/compliance_frameworks.md @eread +/doc/user/group/contribution_analytics/ @lciutacu /doc/user/group/custom_project_templates.md @msedlakjakubowski +/doc/user/group/devops_adoption/ @lciutacu /doc/user/group/epics/ @msedlakjakubowski /doc/user/group/import/ @eread @ashrafkhamis +/doc/user/group/index.md @lciutacu +/doc/user/group/insights/ @lciutacu +/doc/user/group/issues_analytics/ @lciutacu /doc/user/group/iterations/ @msedlakjakubowski +/doc/user/group/manage.md @lciutacu /doc/user/group/moderate_users.md @phillipwells /doc/user/group/planning_hierarchy/ @msedlakjakubowski /doc/user/group/reporting/ @phillipwells @@ -889,6 +888,10 @@ lib/gitlab/checks/** /doc/user/group/roadmap/ @msedlakjakubowski /doc/user/group/saml_sso/ @jglassman1 /doc/user/group/settings/ @jglassman1 +/doc/user/group/ssh_certificates.md @msedlakjakubowski +/doc/user/group/subgroups/ @lciutacu +/doc/user/group/troubleshooting.md @lciutacu +/doc/user/group/value_stream_analytics/ @lciutacu /doc/user/infrastructure/ @phillipwells /doc/user/infrastructure/clusters/manage/management_project_applications/ @phillipwells /doc/user/infrastructure/clusters/manage/management_project_applications/runner.md @fneill @@ -944,8 +947,10 @@ lib/gitlab/checks/** /doc/user/project/repository/web_editor.md @ashrafkhamis /doc/user/project/settings/import_export.md @eread @ashrafkhamis /doc/user/project/settings/import_export_troubleshooting.md @eread @ashrafkhamis -/doc/user/project/settings/index.md @lciutacu +/doc/user/project/settings/migrate_projects.md @lciutacu /doc/user/project/settings/project_access_tokens.md @jglassman1 +/doc/user/project/settings/project_features_permissions.md @lciutacu +/doc/user/project/use_project_as_go_package.md @lciutacu /doc/user/project/web_ide/ @ashrafkhamis /doc/user/project/working_with_projects.md @lciutacu /doc/user/public_access.md @lciutacu diff --git a/.gitlab/ci/release-environments.gitlab-ci.yml b/.gitlab/ci/release-environments.gitlab-ci.yml index 24eca1caf4c..2e0164caf36 100644 --- a/.gitlab/ci/release-environments.gitlab-ci.yml +++ b/.gitlab/ci/release-environments.gitlab-ci.yml @@ -20,4 +20,7 @@ start-release-environments-pipeline: PARENT_PIPELINE_ID: $CI_PIPELINE_ID trigger: strategy: depend - include: .gitlab/ci/release-environments/main.gitlab-ci.yml + include: + - project: 'gitlab-org/gitlab' + ref: 'master' + file: '.gitlab/ci/release-environments/main.gitlab-ci.yml' diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml index 51094378414..57320ca4c6c 100644 --- a/.rubocop_todo/rspec/context_wording.yml +++ b/.rubocop_todo/rspec/context_wording.yml @@ -2960,7 +2960,6 @@ RSpec/ContextWording: - 'spec/tasks/gitlab/packages/migrate_rake_spec.rb' - 'spec/tasks/gitlab/terraform/migrate_rake_spec.rb' - 'spec/tasks/gitlab/workhorse_rake_spec.rb' - - 'spec/tooling/danger/project_helper_spec.rb' - 'spec/tooling/lib/tooling/parallel_rspec_runner_spec.rb' - 'spec/uploaders/attachment_uploader_spec.rb' - 'spec/uploaders/avatar_uploader_spec.rb' diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml index ad42026a079..321aa0befdd 100644 --- a/.rubocop_todo/rspec/feature_category.yml +++ b/.rubocop_todo/rspec/feature_category.yml @@ -5285,7 +5285,6 @@ RSpec/FeatureCategory: - 'spec/tooling/danger/datateam_spec.rb' - 'spec/tooling/danger/feature_flag_spec.rb' - 'spec/tooling/danger/analytics_instrumentation_spec.rb' - - 'spec/tooling/danger/project_helper_spec.rb' - 'spec/tooling/danger/sidekiq_queues_spec.rb' - 'spec/tooling/docs/deprecation_handling_spec.rb' - 'spec/tooling/graphql/docs/renderer_spec.rb' diff --git a/app/assets/javascripts/content_editor/components/formatting_toolbar.vue b/app/assets/javascripts/content_editor/components/formatting_toolbar.vue index f4c28ff9dda..c1eae345f72 100644 --- a/app/assets/javascripts/content_editor/components/formatting_toolbar.vue +++ b/app/assets/javascripts/content_editor/components/formatting_toolbar.vue @@ -75,137 +75,137 @@ export default { diff --git a/app/assets/javascripts/emoji/components/category.vue b/app/assets/javascripts/emoji/components/category.vue index d8607cbc60b..80850475b96 100644 --- a/app/assets/javascripts/emoji/components/category.vue +++ b/app/assets/javascripts/emoji/components/category.vue @@ -52,7 +52,7 @@ export default { :key="index" :emojis="emojiGroup" :render-group="renderGroup" - :click-emoji="(emoji) => onClick(emoji)" + @emoji-click="onClick" />

diff --git a/app/assets/javascripts/emoji/components/emoji_group.vue b/app/assets/javascripts/emoji/components/emoji_group.vue index bbac6866636..bb0c3b0a694 100644 --- a/app/assets/javascripts/emoji/components/emoji_group.vue +++ b/app/assets/javascripts/emoji/components/emoji_group.vue @@ -1,10 +1,10 @@ - -