Add latest changes from gitlab-org/gitlab@master

13 files changed, 8 insertions, 17 deletions

diff --git a/db/migrate/20200215222507_drop_forked_project_links_fk.rb b/db/migrate/20200215222507_drop_forked_project_links_fk.rb
index 226e3fbcf85..7fe38a6ccdb 100644
--- a/db/migrate/20200215222507_drop_forked_project_links_fk.rb
+++ b/db/migrate/20200215222507_drop_forked_project_links_fk.rb
@@ -8,20 +8,16 @@ class DropForkedProjectLinksFk < ActiveRecord::Migration[6.0]
   disable_ddl_transaction!
 
   def up
-    # rubocop: disable Migration/WithLockRetriesWithoutDdlTransaction
     with_lock_retries do
       remove_foreign_key_if_exists :forked_project_links, column: :forked_to_project_id
     end
-    # rubocop: enable Migration/WithLockRetriesWithoutDdlTransaction
   end
 
   def down
     unless foreign_key_exists?(:forked_project_links, :projects, column: :forked_to_project_id)
-      # rubocop: disable Migration/WithLockRetriesWithoutDdlTransaction
       with_lock_retries do
         add_foreign_key :forked_project_links, :projects, column: :forked_to_project_id, on_delete: :cascade, validate: false
       end
-      # rubocop: enable Migration/WithLockRetriesWithoutDdlTransaction
     end
 
     fk_name = concurrent_foreign_key_name(:forked_project_links, :forked_to_project_id, prefix: 'fk_rails_')
diff --git a/db/migrate/20200304024025_add_sprint_id_index_to_issues.rb b/db/migrate/20200304024025_add_sprint_id_index_to_issues.rb
index 1782841f82e..aaece3445db 100644
--- a/db/migrate/20200304024025_add_sprint_id_index_to_issues.rb
+++ b/db/migrate/20200304024025_add_sprint_id_index_to_issues.rb
@@ -13,7 +13,7 @@ class AddSprintIdIndexToIssues < ActiveRecord::Migration[6.0]
   end
 
   def down
-    with_lock_retries do # rubocop:disable Migration/WithLockRetriesWithoutDdlTransaction
+    with_lock_retries do
       remove_foreign_key :issues, column: :sprint_id
     end
     remove_concurrent_index :issues, :sprint_id
diff --git a/db/migrate/20200304024042_add_sprint_id_index_to_merge_requests.rb b/db/migrate/20200304024042_add_sprint_id_index_to_merge_requests.rb
index 44fbab4b96a..219d10ff47c 100644
--- a/db/migrate/20200304024042_add_sprint_id_index_to_merge_requests.rb
+++ b/db/migrate/20200304024042_add_sprint_id_index_to_merge_requests.rb
@@ -13,7 +13,7 @@ class AddSprintIdIndexToMergeRequests < ActiveRecord::Migration[6.0]
   end
 
   def down
-    with_lock_retries do # rubocop:disable Migration/WithLockRetriesWithoutDdlTransaction
+    with_lock_retries do
       remove_foreign_key :merge_requests, column: :sprint_id
     end
     remove_concurrent_index :merge_requests, :sprint_id
diff --git a/db/migrate/20200407171133_add_protected_tag_create_access_levels_user_id_foreign_key.rb b/db/migrate/20200407171133_add_protected_tag_create_access_levels_user_id_foreign_key.rb
index 3d41707face..79532b8179c 100644
--- a/db/migrate/20200407171133_add_protected_tag_create_access_levels_user_id_foreign_key.rb
+++ b/db/migrate/20200407171133_add_protected_tag_create_access_levels_user_id_foreign_key.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop: disable Migration/WithLockRetriesWithoutDdlTransaction
 class AddProtectedTagCreateAccessLevelsUserIdForeignKey < ActiveRecord::Migration[6.0]
   include Gitlab::Database::MigrationHelpers
 
diff --git a/db/migrate/20200408154331_add_protected_branch_merge_access_levels_user_id_foreign_key.rb b/db/migrate/20200408154331_add_protected_branch_merge_access_levels_user_id_foreign_key.rb
index 943aea902fa..0c5118c162b 100644
--- a/db/migrate/20200408154331_add_protected_branch_merge_access_levels_user_id_foreign_key.rb
+++ b/db/migrate/20200408154331_add_protected_branch_merge_access_levels_user_id_foreign_key.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop: disable Migration/WithLockRetriesWithoutDdlTransaction
 class AddProtectedBranchMergeAccessLevelsUserIdForeignKey < ActiveRecord::Migration[6.0]
   include Gitlab::Database::MigrationHelpers
 
diff --git a/db/migrate/20200408154411_add_path_locks_user_id_foreign_key.rb b/db/migrate/20200408154411_add_path_locks_user_id_foreign_key.rb
index 65e857ff88f..aae79c175bc 100644
--- a/db/migrate/20200408154411_add_path_locks_user_id_foreign_key.rb
+++ b/db/migrate/20200408154411_add_path_locks_user_id_foreign_key.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop: disable Migration/WithLockRetriesWithoutDdlTransaction
 class AddPathLocksUserIdForeignKey < ActiveRecord::Migration[6.0]
   include Gitlab::Database::MigrationHelpers
 
diff --git a/db/migrate/20200408154455_add_protected_branch_push_access_levels_user_id_foreign_key.rb b/db/migrate/20200408154455_add_protected_branch_push_access_levels_user_id_foreign_key.rb
index 01676156fb5..1cfe240df05 100644
--- a/db/migrate/20200408154455_add_protected_branch_push_access_levels_user_id_foreign_key.rb
+++ b/db/migrate/20200408154455_add_protected_branch_push_access_levels_user_id_foreign_key.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop: disable Migration/WithLockRetriesWithoutDdlTransaction
 class AddProtectedBranchPushAccessLevelsUserIdForeignKey < ActiveRecord::Migration[6.0]
   include Gitlab::Database::MigrationHelpers
 
diff --git a/db/migrate/20200408154604_add_u2f_registrations_user_id_foreign_key.rb b/db/migrate/20200408154604_add_u2f_registrations_user_id_foreign_key.rb
index 74d826adc88..cdb81d73c99 100644
--- a/db/migrate/20200408154604_add_u2f_registrations_user_id_foreign_key.rb
+++ b/db/migrate/20200408154604_add_u2f_registrations_user_id_foreign_key.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop: disable Migration/WithLockRetriesWithoutDdlTransaction
 class AddU2fRegistrationsUserIdForeignKey < ActiveRecord::Migration[6.0]
   include Gitlab::Database::MigrationHelpers
 
diff --git a/db/migrate/20200420172752_add_sprints_foreign_key_to_projects.rb b/db/migrate/20200420172752_add_sprints_foreign_key_to_projects.rb
index 8d1af8f98c7..46b5c9c2ac2 100644
--- a/db/migrate/20200420172752_add_sprints_foreign_key_to_projects.rb
+++ b/db/migrate/20200420172752_add_sprints_foreign_key_to_projects.rb
@@ -12,7 +12,7 @@ class AddSprintsForeignKeyToProjects < ActiveRecord::Migration[6.0]
   end
 
   def down
-    with_lock_retries do # rubocop:disable Migration/WithLockRetriesWithoutDdlTransaction
+    with_lock_retries do
       remove_foreign_key :sprints, column: :project_id
     end
   end
diff --git a/db/migrate/20200420172927_add_sprints_foreign_key_to_groups.rb b/db/migrate/20200420172927_add_sprints_foreign_key_to_groups.rb
index 81b9805b874..cd90fe50cde 100644
--- a/db/migrate/20200420172927_add_sprints_foreign_key_to_groups.rb
+++ b/db/migrate/20200420172927_add_sprints_foreign_key_to_groups.rb
@@ -12,7 +12,7 @@ class AddSprintsForeignKeyToGroups < ActiveRecord::Migration[6.0]
   end
 
   def down
-    with_lock_retries do # rubocop:disable Migration/WithLockRetriesWithoutDdlTransaction
+    with_lock_retries do
       remove_foreign_key :sprints, column: :group_id
     end
   end
diff --git a/db/migrate/20200423081441_add_foreign_key_from_users_to_metrics_users_starred_dashboars.rb b/db/migrate/20200423081441_add_foreign_key_from_users_to_metrics_users_starred_dashboars.rb
index c30e753be62..c3a7635193c 100644
--- a/db/migrate/20200423081441_add_foreign_key_from_users_to_metrics_users_starred_dashboars.rb
+++ b/db/migrate/20200423081441_add_foreign_key_from_users_to_metrics_users_starred_dashboars.rb
@@ -11,7 +11,7 @@ class AddForeignKeyFromUsersToMetricsUsersStarredDashboars < ActiveRecord::Migra
   end
 
   def down
-    with_lock_retries do # rubocop:disable Migration/WithLockRetriesWithoutDdlTransaction
+    with_lock_retries do
       remove_foreign_key_if_exists :metrics_users_starred_dashboards, column: :user_id
     end
   end
diff --git a/db/migrate/20200423081519_add_foreign_key_from_projects_to_metrics_users_starred_dashboars.rb b/db/migrate/20200423081519_add_foreign_key_from_projects_to_metrics_users_starred_dashboars.rb
index 4a4239d7b8c..88565c24eca 100644
--- a/db/migrate/20200423081519_add_foreign_key_from_projects_to_metrics_users_starred_dashboars.rb
+++ b/db/migrate/20200423081519_add_foreign_key_from_projects_to_metrics_users_starred_dashboars.rb
@@ -11,7 +11,7 @@ class AddForeignKeyFromProjectsToMetricsUsersStarredDashboars < ActiveRecord::Mi
   end
 
   def down
-    with_lock_retries do # rubocop:disable Migration/WithLockRetriesWithoutDdlTransaction
+    with_lock_retries do
       remove_foreign_key_if_exists :metrics_users_starred_dashboards, column: :project_id
     end
   end
diff --git a/db/post_migrate/20200424043515_drop_namespaces_plan_id.rb b/db/post_migrate/20200424043515_drop_namespaces_plan_id.rb
index 53ce13cc699..16a56b16e5a 100644
--- a/db/post_migrate/20200424043515_drop_namespaces_plan_id.rb
+++ b/db/post_migrate/20200424043515_drop_namespaces_plan_id.rb
@@ -8,14 +8,14 @@ class DropNamespacesPlanId < ActiveRecord::Migration[6.0]
   disable_ddl_transaction!
 
   def up
-    with_lock_retries do # rubocop: disable Migration/WithLockRetriesWithoutDdlTransaction
+    with_lock_retries do
       remove_column :namespaces, :plan_id
     end
   end
 
   def down
     unless column_exists?(:namespaces, :plan_id)
-      with_lock_retries do # rubocop: disable Migration/WithLockRetriesWithoutDdlTransaction
+      with_lock_retries do
         add_column :namespaces, :plan_id, :integer
       end
     end