diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
| commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
| tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /app/serializers/fork_namespace_entity.rb | |
| parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/serializers/fork_namespace_entity.rb')
| -rw-r--r-- | app/serializers/fork_namespace_entity.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/serializers/fork_namespace_entity.rb b/app/serializers/fork_namespace_entity.rb index 068862e0951..abfaf4be811 100644 --- a/app/serializers/fork_namespace_entity.rb +++ b/app/serializers/fork_namespace_entity.rb @@ -19,7 +19,7 @@ class ForkNamespaceEntity < Grape::Entity end expose :permission do |namespace, options| - membership(options[:current_user], namespace)&.human_access + membership(options[:current_user], namespace, options[:memberships])&.human_access end expose :relative_path do |namespace| @@ -37,10 +37,10 @@ class ForkNamespaceEntity < Grape::Entity private # rubocop: disable CodeReuse/ActiveRecord - def membership(user, object) + def membership(user, object, memberships) return unless user - @membership ||= user.members.find_by(source: object) + memberships[object.id] end # rubocop: enable CodeReuse/ActiveRecord |