Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Niedzielski <adamsunday@gmail.com>2016-08-01 21:12:30 +0300
committerAdam Niedzielski <adamsunday@gmail.com>2016-08-01 21:12:30 +0300
commit6d92cd3e836f2252b660479f5b33d15e6456b04d (patch)
tree547f223094b73a62ce033e9526660dd5457a45a8 /app/models/members
parente299504b798c053817f1c866649542ac0c779924 (diff)
WIP
Diffstat (limited to 'app/models/members')
-rw-r--r--app/models/members/project_member.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb
index f39afc61ce9..b86b536005b 100644
--- a/app/models/members/project_member.rb
+++ b/app/models/members/project_member.rb
@@ -33,7 +33,7 @@ class ProjectMember < Member
# :master
# )
#
- def add_users_into_projects(project_ids, user_ids, access, current_user = nil)
+ def add_users_into_projects(project_ids, user_ids, access, current_user = nil, expires_at = nil)
access_level = if roles_hash.has_key?(access)
roles_hash[access]
elsif roles_hash.values.include?(access.to_i)
@@ -49,7 +49,7 @@ class ProjectMember < Member
project = Project.find(project_id)
users.each do |user|
- Member.add_user(project.project_members, user, access_level, current_user)
+ Member.add_user(project.project_members, user, access_level, current_user, expires_at)
end
end
end