summaryrefslogtreecommitdiff
path: root/app/models/project_team.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2016-08-18 17:01:50 +0100
committerSean McGivern <sean@gitlab.com>2016-08-18 21:09:17 +0100
commit396f85e438ddc9bcd89f5a557980ce82b71e098b (patch)
tree107f557ebf32d9cb76111edb36c656c54d80f5cc /app/models/project_team.rb
parent8b1656282bcc39a0c1c7a3dccf74c98b1c3adae2 (diff)
downloadgitlab-ce-396f85e438ddc9bcd89f5a557980ce82b71e098b.tar.gz
Add expiration date to group memberships
Diffstat (limited to 'app/models/project_team.rb')
-rw-r--r--app/models/project_team.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/project_team.rb b/app/models/project_team.rb
index a65d271d262..ab6ea2aae36 100644
--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
@@ -17,7 +17,7 @@ class ProjectTeam
if users.respond_to?(:each)
add_users(users, access, current_user: current_user)
else
- add_user(users, access, current_user)
+ add_user(users, access, current_user: current_user)
end
end
@@ -43,8 +43,8 @@ class ProjectTeam
)
end
- def add_user(user, access, current_user = nil)
- add_users([user], access, current_user: current_user)
+ def add_user(user, access, current_user: nil, expires_at: nil)
+ add_users([user], access, current_user: current_user, expires_at: expires_at)
end
# Remove all users from project team