From 0f7206f366bf7e9488e357dd2fb11ad521cc689d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 26 Apr 2025 00:07:46 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- app/helpers/application_helper.rb | 1 - config/feature_flags/beta/force_scrollbar.yml | 9 ------- ...kfill_finish_onboarding_for_group_saml.yml | 2 +- ...e_ai_troubleshoot_job_events_project_fk.rb | 9 +++---- ...ckfill_finish_onboarding_for_group_saml.rb | 25 +++++++++++++++++++ db/schema_migrations/20250410134740 | 1 + db/structure.sql | 2 +- doc/user/duo_amazon_q/_index.md | 4 ++- package.json | 2 +- spec/helpers/application_helper_spec.rb | 14 ----------- yarn.lock | 12 ++++----- 11 files changed, 42 insertions(+), 39 deletions(-) delete mode 100644 config/feature_flags/beta/force_scrollbar.yml create mode 100644 db/post_migrate/20250410134740_finalize_backfill_finish_onboarding_for_group_saml.rb create mode 100644 db/schema_migrations/20250410134740 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9e2cd1491df..57668b0b3c6 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -336,7 +336,6 @@ module ApplicationHelper end def body_scroll_classes - return '' unless Feature.enabled?(:force_scrollbar, current_user, type: :beta) return '' if content_for(:disable_fixed_body_scroll).present? # Custom class is used instead of Tailwind so people can discover this, do not replace this with Tailwind analog diff --git a/config/feature_flags/beta/force_scrollbar.yml b/config/feature_flags/beta/force_scrollbar.yml deleted file mode 100644 index 3dfeb07efad..00000000000 --- a/config/feature_flags/beta/force_scrollbar.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: force_scrollbar -feature_issue_url: -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/186498 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/534572 -milestone: '17.11' -group: group::personal productivity -type: beta -default_enabled: false diff --git a/db/docs/batched_background_migrations/backfill_finish_onboarding_for_group_saml.yml b/db/docs/batched_background_migrations/backfill_finish_onboarding_for_group_saml.yml index 8636e674d40..84ce7d5e358 100644 --- a/db/docs/batched_background_migrations/backfill_finish_onboarding_for_group_saml.yml +++ b/db/docs/batched_background_migrations/backfill_finish_onboarding_for_group_saml.yml @@ -5,4 +5,4 @@ feature_category: onboarding introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/183559 milestone: '17.10' queued_migration_version: 20250305135537 -finalized_by: # version of the migration that finalized this BBM +finalized_by: 20250410134740 diff --git a/db/migrate/20250423110006_change_ai_troubleshoot_job_events_project_fk.rb b/db/migrate/20250423110006_change_ai_troubleshoot_job_events_project_fk.rb index d3fc4327a47..7e0466d07dd 100644 --- a/db/migrate/20250423110006_change_ai_troubleshoot_job_events_project_fk.rb +++ b/db/migrate/20250423110006_change_ai_troubleshoot_job_events_project_fk.rb @@ -7,13 +7,12 @@ class ChangeAiTroubleshootJobEventsProjectFk < Gitlab::Database::Migration[2.2] milestone '18.0' def up - remove_foreign_key :ai_troubleshoot_job_events, column: :project_id - add_concurrent_partitioned_foreign_key :ai_troubleshoot_job_events, :projects, column: :project_id, - on_delete: :cascade + # NOP due to https://gitlab.com/gitlab-com/gl-infra/production/-/issues/19723 + # This already ran on staging. end def down - remove_foreign_key :ai_troubleshoot_job_events, column: :project_id - add_concurrent_partitioned_foreign_key :ai_troubleshoot_job_events, :projects, column: :project_id, on_delete: nil + # NOP due to https://gitlab.com/gitlab-com/gl-infra/production/-/issues/19723 + # This already ran on staging. end end diff --git a/db/post_migrate/20250410134740_finalize_backfill_finish_onboarding_for_group_saml.rb b/db/post_migrate/20250410134740_finalize_backfill_finish_onboarding_for_group_saml.rb new file mode 100644 index 00000000000..5e2abe0f7e0 --- /dev/null +++ b/db/post_migrate/20250410134740_finalize_backfill_finish_onboarding_for_group_saml.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +class FinalizeBackfillFinishOnboardingForGroupSaml < Gitlab::Database::Migration[2.2] + milestone '18.0' + + MIGRATION = 'BackfillFinishOnboardingForGroupSaml' + disable_ddl_transaction! + + restrict_gitlab_migration gitlab_schema: :gitlab_main + + def up + ensure_batched_background_migration_is_finished( + job_class_name: MIGRATION, + table_name: :identities, + column_name: :id, + job_arguments: [], + finalize: true, + skip_early_finalization_validation: true + ) + end + + def down + # no-op + end +end diff --git a/db/schema_migrations/20250410134740 b/db/schema_migrations/20250410134740 new file mode 100644 index 00000000000..125cff365b0 --- /dev/null +++ b/db/schema_migrations/20250410134740 @@ -0,0 +1 @@ +534f1055cd58cf7084a75437283b6fdb25cfc2f5cbb69b442efed6600cdee4a4 \ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 7109940f2df..056db72e6b2 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -44251,7 +44251,7 @@ ALTER TABLE ONLY external_status_checks ADD CONSTRAINT fk_rails_1f5a8aa809 FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE; ALTER TABLE ai_troubleshoot_job_events - ADD CONSTRAINT fk_rails_1fb7e812da FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE; + ADD CONSTRAINT fk_rails_1fb7e812da FOREIGN KEY (project_id) REFERENCES projects(id); ALTER TABLE ONLY dora_daily_metrics ADD CONSTRAINT fk_rails_1fd07aff6f FOREIGN KEY (environment_id) REFERENCES environments(id) ON DELETE CASCADE; diff --git a/doc/user/duo_amazon_q/_index.md b/doc/user/duo_amazon_q/_index.md index 4b76fc3829b..66963bc5fdd 100644 --- a/doc/user/duo_amazon_q/_index.md +++ b/doc/user/duo_amazon_q/_index.md @@ -30,6 +30,8 @@ If you have a GitLab Duo Pro or Duo Enterprise add-on, this feature is not avail At Re:Invent 2024, Amazon announced the GitLab Duo with Amazon Q integration. With this integration, you can automate tasks and increase productivity. +To get a subscription to GitLab Duo with Amazon Q, contact your Account Executive. + For a click-through demo, see [the GitLab Duo with Amazon Q Product Tour](https://gitlab.navattic.com/duo-with-q). @@ -37,7 +39,7 @@ For a click-through demo, see [the GitLab Duo with Amazon Q Product Tour](https: To access GitLab Duo with Amazon Q, request [access to a lab environment](https://about.gitlab.com/partners/technology-partners/aws/#interest). -Alternately, if you have GitLab 17.8 or later, you can +Alternately, if you have GitLab 17.11 or later, you can [set it up on your GitLab Self-Managed instance](setup.md). ## Use GitLab Duo with Amazon Q in an issue diff --git a/package.json b/package.json index f5e1ab6650a..d0e0dbd7470 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "@gitlab/application-sdk-browser": "^0.3.4", "@gitlab/at.js": "1.5.7", "@gitlab/cluster-client": "^3.0.0", - "@gitlab/duo-ui": "^8.10.0", + "@gitlab/duo-ui": "^8.14.0", "@gitlab/favicon-overlay": "2.0.0", "@gitlab/fonts": "^1.3.0", "@gitlab/query-language-rust": "0.5.2", diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 7cfe433a7c5..244a0a1a041 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -768,23 +768,9 @@ RSpec.describe ApplicationHelper do end describe '#body_scroll_classes' do - before do - stub_feature_flags(force_scrollbar: true) - end - it 'fixes body scroll by default' do expect(helper.body_scroll_classes).to eq('body-fixed-scrollbar') end - - context 'with feature disabled' do - before do - stub_feature_flags(force_scrollbar: false) - end - - it 'does nothing' do - expect(helper.body_scroll_classes).to eq('') - end - end end describe '#dispensable_render' do diff --git a/yarn.lock b/yarn.lock index c92555b09f0..80a079ec41e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1337,7 +1337,7 @@ dependencies: "@floating-ui/core" "^1.3.1" -"@floating-ui/dom@^1.0.0", "@floating-ui/dom@^1.6.13": +"@floating-ui/dom@1.6.13", "@floating-ui/dom@^1.0.0", "@floating-ui/dom@^1.6.13": version "1.6.13" resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.13.tgz#a8a938532aea27a95121ec16e667a7cbe8c59e34" integrity sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w== @@ -1381,12 +1381,12 @@ core-js "^3.29.1" mitt "^3.0.1" -"@gitlab/duo-ui@^8.10.0": - version "8.10.0" - resolved "https://registry.yarnpkg.com/@gitlab/duo-ui/-/duo-ui-8.10.0.tgz#2a7d2080045c4becc8df7564314010615418bef8" - integrity sha512-mpODFHF6xPnXbY7/uC9CWCZl7BfMNAAd4qu2ok6VCDsaT2TlkP50IbQ6WjUBuIBHwhofmyDsZ02Xi5bESv52eQ== +"@gitlab/duo-ui@^8.14.0": + version "8.14.0" + resolved "https://registry.yarnpkg.com/@gitlab/duo-ui/-/duo-ui-8.14.0.tgz#ae7c471a8cbb91cb5d581592142c29f94ec73438" + integrity sha512-nO9MK1UrvBjnaGFyvspQ+EIDJ/QEerbQvxx3c6ZYjwOcxPlAUSOi9qCUkERZWN/RfH937lVwuoZXSNg0YkFDnQ== dependencies: - "@floating-ui/dom" "1.4.3" + "@floating-ui/dom" "1.6.13" echarts "^5.3.2" iframe-resizer "^4.3.2" lodash "^4.17.20"