Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 0 deletions

diff --git a/doc/development/geo/framework.md b/doc/development/geo/framework.md
index 55f4be07bb4..79e9868ec85 100644
--- a/doc/development/geo/framework.md
+++ b/doc/development/geo/framework.md
@@ -207,6 +207,11 @@ For example, to add support for files referenced by a `Widget` model with a
    end
    ```
 
+   NOTE: **Note:**
+
+   If there is a common constraint for records to be available for replication,
+   make sure to also overwrite the `available_replicables` scope.
+
 1. Create `ee/app/replicators/geo/widget_replicator.rb`. Implement the
    `#carrierwave_uploader` method which should return a `CarrierWave::Uploader`.
    And implement the class method `.model` to return the `Widget` class.
@@ -560,6 +565,10 @@ Metrics are gathered by `Geo::MetricsUpdateWorker`, persisted in
    end
    ```
 
+1. Make sure the factory also allows setting a `project` attribute. If the model
+   does not have a direct relation to a project, you can use a `transient`
+   attribute. Check out `spec/factories/merge_request_diffs.rb` for an example.
+
 Widget replication and verification metrics should now be available in the API,
 the Admin Area UI, and Prometheus!