Commit aa1d03da authored by Stan Hu's avatar Stan Hu

Merge branch 'pb-fix-member-entity-foss-spec' into 'master'

Fix missing current_user on MemberEntity

See merge request gitlab-org/gitlab!76888
parents 48494284 ba2f7053
...@@ -63,6 +63,12 @@ class MemberEntity < Grape::Entity ...@@ -63,6 +63,12 @@ class MemberEntity < Grape::Entity
member.respond_to?(:invited_user_state) ? member.invited_user_state : "" member.respond_to?(:invited_user_state) ? member.invited_user_state : ""
end end
end end
private
def current_user
options[:current_user]
end
end end
MemberEntity.prepend_mod_with('MemberEntity') MemberEntity.prepend_mod_with('MemberEntity')
...@@ -24,10 +24,6 @@ module EE ...@@ -24,10 +24,6 @@ module EE
private private
def current_user
options[:current_user]
end
def group def group
options[:group] options[:group]
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment