diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-07 09:51:48 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-11-07 09:51:48 +0300 |
| commit | 1b788c66a1b1861d8dcca14785d22c59e31713fd (patch) | |
| tree | 90bcb8aca6fba513bda4296b0143febce1f4a21f /lib/gitlab/background_migration | |
| parent | 6da118095b6d3b7a1cf306a82841cb265d7d8016 (diff) | |
| parent | bb55bcddb80adf017d82758587761f413674d985 (diff) | |
Merge branch 'sh-fix-issue-52649' into 'master'
Fix statement timeouts in RemoveRestrictedTodos migration
Closes #52649
See merge request gitlab-org/gitlab-ce!22795
Diffstat (limited to 'lib/gitlab/background_migration')
| -rw-r--r-- | lib/gitlab/background_migration/remove_restricted_todos.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/background_migration/remove_restricted_todos.rb b/lib/gitlab/background_migration/remove_restricted_todos.rb index 9941c2fe6d9..47579d46c1b 100644 --- a/lib/gitlab/background_migration/remove_restricted_todos.rb +++ b/lib/gitlab/background_migration/remove_restricted_todos.rb @@ -67,7 +67,7 @@ module Gitlab .where('access_level >= ?', 20) confidential_issues = Issue.select(:id, :author_id).where(confidential: true, project_id: project_id) - confidential_issues.each_batch(of: 100) do |batch| + confidential_issues.each_batch(of: 100, order_hint: :confidential) do |batch| batch.each do |issue| assigned_users = IssueAssignee.select(:user_id).where(issue_id: issue.id) |