summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-19 06:08:03 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-19 06:08:03 +0000
commit4e81d9c050bfea4c866329155c17b929d7381340 (patch)
tree70fd5d3445f0b285650e068a6e99e970ceee5e00 /.rubocop.yml
parentfdfde5a37a82274d7babf2519fc802c03e728622 (diff)
downloadgitlab-ce-4e81d9c050bfea4c866329155c17b929d7381340.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml10
1 files changed, 10 insertions, 0 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 22806de5083..6687ada610a 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -461,3 +461,13 @@ Performance/ChainArrayAllocation:
- 'lib/gitlab/import_export/**/*'
- 'ee/lib/gitlab/import_export/**/*'
- 'ee/lib/ee/gitlab/import_export/**/*'
+
+Rails/TimeZone:
+ Enabled: true
+ EnforcedStyle: 'flexible'
+ Include:
+ - 'app/services/**/*'
+ - 'spec/services/**/*'
+ - 'ee/app/services/**/*'
+ - 'ee/spec/services/**/*'
+