diff --git a/.rubocop_todo/migration/ensure_factory_for_table.yml b/.rubocop_todo/migration/ensure_factory_for_table.yml
index 762a2b12035..10fb9c293de 100644
--- a/.rubocop_todo/migration/ensure_factory_for_table.yml
+++ b/.rubocop_todo/migration/ensure_factory_for_table.yml
@@ -5,26 +5,16 @@ Migration/EnsureFactoryForTable:
- 'db/migrate/20230926092944_add_approval_group_rules_groups.rb'
- 'db/migrate/20230926093004_add_approval_group_rules_users.rb'
- 'db/migrate/20230926093025_add_approval_group_rules_protected_branches.rb'
- - 'db/migrate/20231017095738_create_activity_pub_releases_subscriptions.rb'
- - 'db/migrate/20231017134349_create_ml_model_metadata.rb'
- 'db/migrate/20231020095624_create_audit_events_streaming_http_group_namespace_filters.rb'
- - 'db/migrate/20231025123238_create_compliance_framework_security_policies.rb'
- 'db/migrate/20231031164724_create_sbom_occurrences_vulnerabilities.rb'
- - 'db/migrate/20231102142553_add_zoekt_nodes.rb'
- - 'db/migrate/20231107140642_create_audit_events_instance_amazon_s3_configurations.rb'
- 'db/migrate/20231110044738_create_abuse_report_assignees_table.rb'
- 'db/migrate/20231115064007_create_audit_events_streaming_http_instance_namespace_filters.rb'
- 'db/migrate/20231124191759_add_catalog_resource_sync_events_table.rb'
- 'db/migrate/20231207150738_add_work_item_dates_sources.rb'
- - 'db/migrate/20231215192706_create_ml_model_version_metadata.rb'
- 'db/migrate/20231220113459_add_work_item_color.rb'
- - 'db/migrate/20231221033539_create_sbom_source_packages_table.rb'
- - 'db/migrate/20231221113948_create_cloud_connector_access.rb'
- 'db/migrate/20240108123023_create_ai_agents_table.rb'
- 'db/migrate/20240108123115_create_ai_agent_versions_table.rb'
- 'db/migrate/20240112124030_create_audit_events_group_external_streaming_destinations.rb'
- - 'db/migrate/20240115185037_create_packages_terraform_module_metadata.rb'
- - 'db/migrate/20240122165824_create_ci_job_token_group_scope_links.rb'
- 'db/migrate/20240130162148_create_audit_events_instance_external_streaming_destinations.rb'
- 'db/migrate/20240131052824_create_catalog_verified_namespaces.rb'
- 'db/migrate/20240201112236_create_group_saved_replies_table.rb'
@@ -34,7 +24,3 @@ Migration/EnsureFactoryForTable:
- 'db/migrate/20240304184128_create_ci_build_names_table.rb'
- 'db/migrate/20240306121653_create_relation_import_tracker.rb'
- 'db/migrate/20240404192955_create_early_access_program_tracking_events.rb'
- - 'db/migrate/20240419082037_create_ai_self_hosted_models.rb'
- - 'db/migrate/20240423064716_create_ci_build_execution_config.rb'
- - 'db/migrate/20240430110033_create_ai_feature_settings.rb'
- - 'db/migrate/20241127092714_create_container_registry_protection_tag_rules.rb'
diff --git a/app/assets/javascripts/emoji/constants.js b/app/assets/javascripts/emoji/constants.js
index 4f320dce069..20a1415f1b1 100644
--- a/app/assets/javascripts/emoji/constants.js
+++ b/app/assets/javascripts/emoji/constants.js
@@ -34,7 +34,7 @@ export const CATEGORY_ICON_MAP = {
/* eslint-enable @gitlab/require-i18n-strings */
export const EMOJIS_PER_ROW = 9;
-export const EMOJI_ROW_HEIGHT = 34;
+export const EMOJI_ROW_HEIGHT = 36;
export const CATEGORY_ROW_HEIGHT = 37;
export const CACHE_VERSION_KEY = 'gl-emoji-map-version';
diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue
index e8cd7eba82e..ef95158c3a2 100644
--- a/app/assets/javascripts/notes/components/comment_form.vue
+++ b/app/assets/javascripts/notes/components/comment_form.vue
@@ -239,6 +239,7 @@ export default {
if (this.note.length) {
const noteData = {
endpoint: isDraft ? this.draftEndpoint : this.endpoint,
+ flashContainer: this.$el,
data: {
note: {
noteable_type: this.noteableType,
@@ -371,6 +372,7 @@ export default {