root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2025-04-26 00:07:46 +00:00
parent 5be9a1d621
commit 0f7206f366
11 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/helpers/application_helper.rb
View File

@ -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

9
config/feature_flags/beta/force_scrollbar.yml
View File

@ -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

2
db/docs/batched_background_migrations/backfill_finish_onboarding_for_group_saml.yml
View File

@ -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

9
db/migrate/20250423110006_change_ai_troubleshoot_job_events_project_fk.rb
View File

@ -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

25
db/post_migrate/20250410134740_finalize_backfill_finish_onboarding_for_group_saml.rb Normal file
View File

@ -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

1
db/schema_migrations/20250410134740 Normal file
View File

@ -0,0 +1 @@
534f1055cd58cf7084a75437283b6fdb25cfc2f5cbb69b442efed6600cdee4a4

2
db/structure.sql
View File

@ -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;

4
doc/user/duo_amazon_q/_index.md
View File

@ -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).
<!-- Demo published on 2025-04-23 -->
@ -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

2
package.json
View File

@ -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",

14
spec/helpers/application_helper_spec.rb
View File

@ -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

12
yarn.lock
View File

@ -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"