Automatic merge of gitlab-org/gitlab master

GITALY_SERVER_VERSION

-39a79b3bde65993fd219faf35f24c77d85b357aa
+d554b758056dd291fec6fbe6083e941ccf316fdb

app/models/ci/application_record.rb → app/models/ci/base_model.rb

@@ -7,7 +7,7 @@ module Ci
   # This class is part of a migration to move all CI classes to a new separate database.
   # Initially we are only going to be moving the `Ci::InstanceVariable` model and it will be duplicated in the main and CI tables
   # Do not extend this class in any other models.
-  class ApplicationRecord < ::ApplicationRecord
+  class BaseModel < ::ApplicationRecord
     self.abstract_class = true
 
     if Gitlab::Database.has_config?(:ci)

app/models/ci/instance_variable.rb

 # frozen_string_literal: true
 
 module Ci
-  class InstanceVariable < ::Ci::ApplicationRecord
+  class InstanceVariable < ::Ci::BaseModel
     extend Gitlab::Ci::Model
     extend Gitlab::ProcessMemoryCache::Helper
     include Ci::NewHasVariable

doc/development/database/multiple_databases.md

@@ -95,7 +95,7 @@ database. This is to match the default name Rails has.
 
 ### Migrations
 
-Any migrations that affect `Ci::ApplicationRecord` models
+Any migrations that affect `Ci::BaseModel` models
 and their tables must be placed in two directories for now:
 
 - `db/migrate`

doc/development/foreign_keys.md

@@ -28,7 +28,8 @@ Guide](migration_style_guide.md) for more information.
 
 Keep in mind that you can only safely add foreign keys to existing tables after
 you have removed any orphaned rows. The method `add_concurrent_foreign_key`
-does not take care of this so you'll need to do so manually.
+does not take care of this so you'll need to do so manually. See 
+[adding foreign key constraint to an existing column](database/add_foreign_key_to_existing_column.md).
 
 ## Cascading Deletes