Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 0 deletions

diff --git a/doc/development/foreign_keys.md b/doc/development/foreign_keys.md
index 38b60ce6f0b..508e5665f08 100644
--- a/doc/development/foreign_keys.md
+++ b/doc/development/foreign_keys.md
@@ -87,3 +87,13 @@ create_table :user_configs, id: false do |t|
   ...
 end
 ```
+
+You will also need to add the new primary key to the model:
+
+```ruby
+class UserConfig < ActiveRecord::Base
+  self.primary_key = :user_id
+
+  belongs_to :user
+end
+```