Merge branch 'backport-part-of-ee-744' into 'master'

Make Member#add_user set access_level for requesters ## What does this MR do? This is a backport of https://gitlab.com/gitlab-org/gitlab-ee/commit/c902d8d48409a4d46f7669fc5fc85b9ba86e71d6 from gitlab-org/gitlab-ee!744. ## Why was this MR needed? This change is only used in EE right now, but there's no reason why it wouldn't be part of CE. See merge request !6649

Merge branch 'backport-part-of-ee-744' into 'master'
e565183c · Robert Speicher · 212cf8f9 · de61ebc8 · e565183c
Commit e565183c authored Oct 07, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

member.rb app/models/member.rb +6 -1

No files found.
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -103,7 +103,12 @@ class Member < ActiveRecord::Base
      }
      if member.request?
-        ::Members::ApproveAccessRequestService.new(source, current_user, id: member.id).execute
+        ::Members::ApproveAccessRequestService.new(
+          source,
+          current_user,
+          id: member.id,
+          access_level: access_level
+        ).execute
      else
        member.save
      end