Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

1 files changed, 6 insertions, 1 deletions

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 3413b3e3424..95d1b815e74 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -98,6 +98,10 @@ class Repository
 
   alias_method :raw, :raw_repository
 
+  def flipper_id
+    raw_repository.flipper_id
+  end
+
   # Don't use this! It's going away. Use Gitaly to read or write from repos.
   def path_to_repo
     @path_to_repo ||=
@@ -1232,7 +1236,8 @@ class Repository
     Gitlab::Git::Repository.new(shard,
                                 disk_path + '.git',
                                 repo_type.identifier_for_container(container),
-                                container.full_path)
+                                container.full_path,
+                                container: container)
   end
 end