Automatic merge of gitlab-org/gitlab master

doc/development/migration_style_guide.md

@@ -205,6 +205,30 @@ def down
 end
 ```
 
+**Multiple changes on the same table:**
+
+The helper `with_lock_retries` wraps all operations into a single transaction. When you have the lock,
+you should do as much as possible inside the transaction rather than trying to get another lock later.
+Be careful about running long database statements within the block. The acquired locks are kept until the transaction (block) finishes and depending on the lock type, it might block other database operations.
+
+```ruby
+include Gitlab::Database::MigrationHelpers
+
+def up
+  with_lock_retries do
+    add_column :users, :full_name, :string
+    add_column :users, :bio, :string
+  end
+end
+
+def down
+  with_lock_retries do
+    remove_column :users, :full_name
+    remove_column :users, :bio
+  end
+end
+```
+
 **Removing a foreign key:**
 
 ```ruby

ee/app/services/security/dependency_list_service.rb

@@ -55,7 +55,7 @@ module Security
       when 'packager'
         collection.sort_by! { |a| a[:packager] }
       when 'severity'
-        sort_dependency_vulnerabilities_by_severity!(collection) if Feature.enabled?(:sort_dependency_vulnerabilities, @pipeline.project)
+        sort_dependency_vulnerabilities_by_severity!(collection) if Feature.enabled?(:sort_dependency_vulnerabilities, @pipeline.project, default_enabled: true)
         sort_dependencies_by_severity!(collection)
       else
         collection.sort_by! { |a| a[:name] }

ee/config/feature_flags/development/sort_dependency_vulnerabilities.yml

@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332852
 milestone: '14.0'
 type: development
 group: group::composition analysis
-default_enabled: false
+default_enabled: true