summaryrefslogtreecommitdiff
path: root/rubocop
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-20 09:09:06 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-20 09:09:06 +0000
commitd2add0302cecc2fe66fe04ab8346bb68d6bd24fa (patch)
treec6c934d6470ed90d734adaf9a311b3f390d9ecea /rubocop
parent13cacc20b0bd96abfdf92bbabf0fb23ab46522d5 (diff)
downloadgitlab-ce-d2add0302cecc2fe66fe04ab8346bb68d6bd24fa.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'rubocop')
-rw-r--r--rubocop/rubocop-migrations.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/rubocop/rubocop-migrations.yml b/rubocop/rubocop-migrations.yml
index e1772deee9b..5a5a78bf7f0 100644
--- a/rubocop/rubocop-migrations.yml
+++ b/rubocop/rubocop-migrations.yml
@@ -35,6 +35,7 @@ Migration/UpdateLargeTable:
- :taggings
- :todos
- :users
+ - :user_preferences
- :web_hook_logs
DeniedMethods:
- :change_column_type_concurrently