diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
| commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
| tree | fb69158581673816a8cd895f9d352dcb3c678b1e /lib/gitlab/database/postgresql_adapter/empty_query_ping.rb | |
| parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'lib/gitlab/database/postgresql_adapter/empty_query_ping.rb')
| -rw-r--r-- | lib/gitlab/database/postgresql_adapter/empty_query_ping.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/gitlab/database/postgresql_adapter/empty_query_ping.rb b/lib/gitlab/database/postgresql_adapter/empty_query_ping.rb index 906312478ac..88affaa9757 100644 --- a/lib/gitlab/database/postgresql_adapter/empty_query_ping.rb +++ b/lib/gitlab/database/postgresql_adapter/empty_query_ping.rb @@ -1,5 +1,8 @@ # frozen_string_literal: true +# This patch will be included in the next Rails release: https://github.com/rails/rails/pull/42368 +raise 'This patch can be removed' if Rails::VERSION::MAJOR > 6 + # rubocop:disable Gitlab/ModuleWithInstanceVariables module Gitlab module Database |