gitlab-org--gitlab-foss/app/views
Dmitriy Zaporozhets e3d818a4e8 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.

![Screen_Shot_2015-04-10_at_14.14.32](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fe990e65eccd9203d7324b492941362b/Screen_Shot_2015-04-10_at_14.14.32.png)

Entering an email address that is not already a member will give you the option to invite them.

![Screen_Shot_2015-04-10_at_14.14.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d6b0d4571ea90f2a2e4af8f5b336e8e1/Screen_Shot_2015-04-10_at_14.14.48.png)

Choosing the option will add them to the People field. This works the right way (TM) in combination with adding existing users as members.

![Screen_Shot_2015-04-10_at_14.15.09](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a618e5ec292d79578b16400dca6d4cfe/Screen_Shot_2015-04-10_at_14.15.09.png)

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.

![Screen_Shot_2015-04-10_at_14.15.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3695b9a6778d367b275115747579b46e/Screen_Shot_2015-04-10_at_14.15.19.png)

The invited user will receive an email with an "Accept invitation" link.

![Screen_Shot_2015-04-10_at_14.17.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/730121888153117d83c3cd0e4f5c90f6/Screen_Shot_2015-04-10_at_14.17.52.png)

If they're not already logged in, clicking this link will redirect them to the sign in/up page with a helpful notice.

![Screen_Shot_2015-04-10_at_14.18.12](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1a26a5fa13321e7ef77ed8b538c8557d/Screen_Shot_2015-04-10_at_14.18.12.png)

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.

![Screen_Shot_2015-04-10_at_14.18.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7ac33085463a99b8cfa6baa13bfa1235/Screen_Shot_2015-04-10_at_14.18.48.png)

Accepting the invitation will redirect them to the group (or project) with an appropriate notice.

![Screen_Shot_2015-04-10_at_14.18.58](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7bf02a2e3bea589a11df401c23e68648/Screen_Shot_2015-04-10_at_14.18.58.png)

As currently, they will also receive this information by email.

![Screen_Shot_2015-04-10_at_14.24.00](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b44a342068433a268c0a06ed9e791ffa/Screen_Shot_2015-04-10_at_14.24.00.png)

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.

![Screen_Shot_2015-04-10_at_14.19.07](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b29fea128186f938ec76bd7dec016b83/Screen_Shot_2015-04-10_at_14.19.07.png)

The member row on the Members page will now have been updated with the new user account.

![Screen_Shot_2015-04-10_at_14.19.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cf503d3d1679614e03acec2e946a28c3/Screen_Shot_2015-04-10_at_14.19.23.png)

See merge request !500
2015-04-15 10:48:28 +00:00
..
admin Let members be invited from Add members pane. 2015-04-14 12:08:10 +02:00
dashboard Rename manage_group ability to admin_group for consistency with project. 2015-04-14 12:05:49 +02:00
devise Improve wording below signup box 2015-04-07 17:46:00 -04:00
doorkeeper Refactor buttons 2015-03-14 00:29:32 -07:00
errors
events Change text of project creation event for imports. 2015-04-06 14:51:41 +02:00
explore Add project filter by visibility and tag to explore page 2015-03-10 15:59:14 -07:00
groups Let membership invitations be resent. 2015-04-14 12:08:10 +02:00
help Fix and improve help rendering 2015-04-03 11:56:50 +02:00
import Merge branch 'google-code-import' into 'master' 2015-04-15 06:53:42 +00:00
invites Let invites be declined. 2015-04-14 12:08:11 +02:00
kaminari/gitlab
layouts Merge branch 'invitation' into 'master' 2015-04-15 10:48:28 +00:00
notify Remove superfluous info from invite accepted/declined mails. 2015-04-14 23:06:21 +02:00
profiles Allow user to choose which email to be public 2015-04-14 19:42:48 +08:00
projects Merge branch 'invitation' into 'master' 2015-04-15 10:48:28 +00:00
search Refactor buttons 2015-03-14 00:29:32 -07:00
shared Bust group page project list cache when namespace name or path changes. 2015-04-10 16:10:25 +02:00
snippets Explicitly set image alt to prevent graphical glitches 2015-04-13 21:07:42 +02:00
users Allow user to choose which email to be public 2015-04-14 19:42:48 +08:00
votes Fix votes inline rendering 2015-03-20 15:34:29 -07:00