Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 5 deletions

diff --git a/lib/gitlab/database/partitioning/partition_manager.rb b/lib/gitlab/database/partitioning/partition_manager.rb
index 7e433ecdd39..2ba5b35d6b9 100644
--- a/lib/gitlab/database/partitioning/partition_manager.rb
+++ b/lib/gitlab/database/partitioning/partition_manager.rb
@@ -74,8 +74,9 @@ module Gitlab
         end
 
         def create(partitions)
-          connection.transaction do
-            with_lock_retries do
+          # with_lock_retries starts a requires_new transaction most of the time, but not on the last iteration
+          with_lock_retries do
+            connection.transaction(requires_new: false) do # so we open a transaction here if not already in progress
               partitions.each do |partition|
                 connection.execute partition.to_sql
 
@@ -88,8 +89,9 @@ module Gitlab
         end
 
         def detach(partitions)
-          connection.transaction do
-            with_lock_retries do
+          # with_lock_retries starts a requires_new transaction most of the time, but not on the last iteration
+          with_lock_retries do
+            connection.transaction(requires_new: false) do # so we open a transaction here if not already in progress
               partitions.each { |p| detach_one_partition(p) }
             end
           end
diff --git a/lib/gitlab/database/postgresql_adapter/dump_schema_versions_mixin.rb b/lib/gitlab/database/postgresql_adapter/dump_schema_versions_mixin.rb
index a2e7f4befab..59ca06b5aca 100644
--- a/lib/gitlab/database/postgresql_adapter/dump_schema_versions_mixin.rb
+++ b/lib/gitlab/database/postgresql_adapter/dump_schema_versions_mixin.rb
@@ -7,7 +7,7 @@ module Gitlab
         extend ActiveSupport::Concern
 
         def dump_schema_information # :nodoc:
-          Gitlab::Database::SchemaMigrations.touch_all(self)
+          Gitlab::Database::SchemaMigrations.touch_all(self) if Gitlab.dev_or_test_env?
 
           nil
         end