summaryrefslogtreecommitdiff
path: root/app/models/project_team.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-08-12 17:23:19 -0500
committerDouwe Maan <douwe@selenight.nl>2016-08-12 17:23:19 -0500
commitc770201061c5d39e6e297951badfafc8ddf14906 (patch)
tree72da00c88358d605f33c983945dd7e1565956c47 /app/models/project_team.rb
parent9d9b7212bc5fe04e64a0a034a412f5d92cc96151 (diff)
parent11eefba891f214eefc1efa334adbcc9e979c0ce3 (diff)
downloadgitlab-ce-c770201061c5d39e6e297951badfafc8ddf14906.tar.gz
Merge branch 'master' into diff-line-comment-vuejs
Diffstat (limited to 'app/models/project_team.rb')
-rw-r--r--app/models/project_team.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_team.rb b/app/models/project_team.rb
index 19fd082534c..d0a714cd6fc 100644
--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
@@ -34,7 +34,7 @@ class ProjectTeam
end
def add_users(users, access, current_user = nil)
- ProjectMember.add_users_into_projects(
+ ProjectMember.add_users_to_projects(
[project.id],
users,
access,