diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-02 12:10:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-02 12:10:09 +0300 |
commit | 1930898566965dbc1bd779089ec9e58e17674268 (patch) | |
tree | a1e4384e4e8927431b637daa885dc8793cbb0035 /app/models/concerns/deprecated_assignee.rb | |
parent | 2691cff8296517651e4bcd8adac09640f8cc28f5 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/deprecated_assignee.rb')
-rw-r--r-- | app/models/concerns/deprecated_assignee.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/concerns/deprecated_assignee.rb b/app/models/concerns/deprecated_assignee.rb index 2454bd0c08c..3f557ee9b48 100644 --- a/app/models/concerns/deprecated_assignee.rb +++ b/app/models/concerns/deprecated_assignee.rb @@ -34,7 +34,7 @@ module DeprecatedAssignee end def assignee_ids - if Gitlab::Database.main.read_only? && pending_assignees_population? + if Gitlab::Database.read_only? && pending_assignees_population? return Array(deprecated_assignee_id) end @@ -43,7 +43,7 @@ module DeprecatedAssignee end def assignees - if Gitlab::Database.main.read_only? && pending_assignees_population? + if Gitlab::Database.read_only? && pending_assignees_population? return User.where(id: deprecated_assignee_id) end @@ -56,7 +56,7 @@ module DeprecatedAssignee # This will make the background migration process quicker (#26496) as it'll have less # assignee_id rows to look through. def nullify_deprecated_assignee - return unless persisted? && Gitlab::Database.main.read_only? + return unless persisted? && Gitlab::Database.read_only? update_column(:assignee_id, nil) end |