diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-04 09:09:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-04 09:09:23 +0300 |
| commit | 0250f48d9fc064b902d37e58f09715df0e1dd4e5 (patch) | |
| tree | a6a8cfa30b5b949fd6ef0dba497614ef6472b51e /lib/gitlab/database.rb | |
| parent | 6f286d7717f419489a08a9918621f438256e397b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/database.rb')
| -rw-r--r-- | lib/gitlab/database.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb index dd84127459d..2456a5dd68e 100644 --- a/lib/gitlab/database.rb +++ b/lib/gitlab/database.rb @@ -56,7 +56,7 @@ module Gitlab # Note that we use ActiveRecord::Base here and not ApplicationRecord. # This is deliberate, as we also use these classes to apply load # balancing to, and the load balancer must be enabled for _all_ models - # that inher from ActiveRecord::Base; not just our own models that + # that inherit from ActiveRecord::Base; not just our own models that # inherit from ApplicationRecord. main: ::ActiveRecord::Base, ci: ::Ci::ApplicationRecord.connection_class? ? ::Ci::ApplicationRecord : nil |