diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-15 10:48:28 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-15 10:48:28 +0000 |
| commit | e3d818a4e8f51c00aaba1924690f728aa468d7f2 (patch) | |
| tree | 2893b6d4528cbb0580d42de94725ff00fcfd5786 /lib | |
| parent | b75866120b2391d0f2f01d03601a19baa9fa9b4e (diff) | |
| parent | 3d0c0bd922dadbf09c46f2b8acb58d44565394ce (diff) | |
| download | gitlab-ce-e3d818a4e8f51c00aaba1924690f728aa468d7f2.tar.gz | |
Merge branch 'invitation' into 'master'
Allow users to be invited.
Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2058.
The "Add members" panes for both Group Members and Project Members have gained a line of text by the People field.
Entering an email address that is not already a member will give you the option to invite them.
Choosing the option will add them to the People field. This works the right way (TM) in combination with adding existing users as members.
The invited member will be shown in the members list as such. The access level can be changed, and the invite can be revoked by deleting the member.
The invited user will receive an email with an "Accept invitation" link.
If they're not already logged in, clicking this link will redirect them to the sign in/up page with a helpful notice.
Signing in or signing up will redirect them back to the invite detail page, where they can actually accept the invitation, which will update the member record in question to point to the user in question.
Accepting the invitation will redirect them to the group (or project) with an appropriate notice.
As currently, they will also receive this information by email.
At the same time, the person who initially invited the email address is sent a notification as well, so they know of the new member and to tell them what name the user signed up with.
The member row on the Members page will now have been updated with the new user account.
See merge request !500
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/group_members.rb | 11 | ||||
| -rw-r--r-- | lib/api/groups.rb | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/lib/api/group_members.rb b/lib/api/group_members.rb index ed54c7f6ff0..ab9b7c602b5 100644 --- a/lib/api/group_members.rb +++ b/lib/api/group_members.rb @@ -9,8 +9,7 @@ module API # GET /groups/:id/members get ":id/members" do group = find_group(params[:id]) - members = group.group_members - users = (paginate members).collect(&:user) + users = group.users present users, with: Entities::GroupMember, group: group end @@ -24,7 +23,7 @@ module API # POST /groups/:id/members post ":id/members" do group = find_group(params[:id]) - authorize! :manage_group, group + authorize! :admin_group, group required_attributes! [:user_id, :access_level] unless validate_access_level?(params[:access_level]) @@ -35,7 +34,7 @@ module API render_api_error!("Already exists", 409) end - group.add_users([params[:user_id]], params[:access_level]) + group.add_users([params[:user_id]], params[:access_level], current_user) member = group.group_members.find_by(user_id: params[:user_id]) present member.user, with: Entities::GroupMember, group: group end @@ -50,7 +49,7 @@ module API # PUT /groups/:id/members/:user_id put ':id/members/:user_id' do group = find_group(params[:id]) - authorize! :manage_group, group + authorize! :admin_group, group required_attributes! [:access_level] group_member = group.group_members.find_by(user_id: params[:user_id]) @@ -74,7 +73,7 @@ module API # DELETE /groups/:id/members/:user_id delete ":id/members/:user_id" do group = find_group(params[:id]) - authorize! :manage_group, group + authorize! :admin_group, group member = group.group_members.find_by(user_id: params[:user_id]) if member.nil? diff --git a/lib/api/groups.rb b/lib/api/groups.rb index a92abd4b690..8cb9f920975 100644 --- a/lib/api/groups.rb +++ b/lib/api/groups.rb @@ -61,7 +61,7 @@ module API # DELETE /groups/:id delete ":id" do group = find_group(params[:id]) - authorize! :manage_group, group + authorize! :admin_group, group group.destroy end |