diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-14 22:45:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-14 22:45:29 +0300 |
| commit | b9fe665d2539f53fb86771383e18f9045db52414 (patch) | |
| tree | 7e55fcd9b4dc27f3cb13651ce1c03146c592e483 /app/models | |
| parent | dd22031c62b54a03909b7be829f85032e556a031 (diff) | |
Add latest changes from gitlab-org/gitlab@14-8-stable-ee
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 74832bff9ac..9cd238904ff 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -390,7 +390,7 @@ class User < ApplicationRecord # rubocop: disable CodeReuse/ServiceClass # Ideally we should not call a service object here but user.block - # is also bcalled by Users::MigrateToGhostUserService which references + # is also called by Users::MigrateToGhostUserService which references # this state transition object in order to do a rollback. # For this reason the tradeoff is to disable this cop. after_transition any => :blocked do |user| |