summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-02 15:06:36 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-02 15:06:36 +0000
commit556c79d6cc3d7b24ecbba3a79f8432eb3fcf5c7e (patch)
tree93c84c603316cdee73ce85949ba70e29ef78af32 /lib
parentbffcdf9bca11a4d43cc40e3f382f03088d36f7c6 (diff)
downloadgitlab-ce-556c79d6cc3d7b24ecbba3a79f8432eb3fcf5c7e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/background_migration/migrate_legacy_artifacts.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/gitlab/background_migration/migrate_legacy_artifacts.rb b/lib/gitlab/background_migration/migrate_legacy_artifacts.rb
index 4377ec2987c..23d99274232 100644
--- a/lib/gitlab/background_migration/migrate_legacy_artifacts.rb
+++ b/lib/gitlab/background_migration/migrate_legacy_artifacts.rb
@@ -123,8 +123,6 @@ module Gitlab
end
def add_missing_db_timezone
- return '' unless Gitlab::Database.postgresql?
-
'at time zone \'UTC\''
end
end