delta/gitlab/gitlab-ce.git/lib/api, branch test-improve-gitlab-identifier

Merge branch 'rc-improve-members-destroy-service' into 'master'

2016-10-04T10:50:21+00:00


Improve `Members::DestroyService`

Part of #21979.

See merge request !6267

GrapeDSL for Namespace endpoint

2016-10-04T05:47:29+00:00

Remove useless code now that Member#add_user handles it

2016-10-03T16:43:33+00:00

Signed-off-by: Rémy Coutable

Fix a few things after the initial improvment to Members::DestroyService

2016-10-03T14:57:48+00:00

Signed-off-by: Rémy Coutable

Improve Members::DestroyService

2016-10-03T14:57:48+00:00

Signed-off-by: Rémy Coutable

Merge branch 'zj-grape-award-emoji' into 'master'

2016-10-03T12:13:39+00:00


GrapeDSL for Award Emoji endpoints

Cherry-picked from !6330

See merge request !6629

Merge branch 'zj-grape-keys' into 'master'

2016-10-03T10:57:52+00:00


GrapeDSL for Keys endpoint

No changelog item as it doesn't change behaviour
Cherry-picket from !6330

See merge request !6631

GrapeDSL for Award Emoji endpoints

2016-10-03T08:32:09+00:00

Merge branch '21983-member-add_user-doesn-t-detect-existing-members-that-have-requested-access' into 'master'

2016-10-02T11:42:57+00:00


Resolve "`Member.add_user`doesn't detect existing members that have requested access"

## What does this MR do?

This merge request handle the case when an access requester is added to a group or project (via the members page or the API).

In `Member.add_user`, if an access requester already exists, we simply accept their request (and set the `created_by`, `access_level` and `expires_at` attributes if given).

## Are there points in the code the reviewer needs to double check?

I've taken the opportunity to cleanup the whole `{Group,Project}Member.add_user*` methods since it was quite a mess.

## What are the relevant issue numbers?

Closes #21983

See merge request !6393

GrapeDSL for Keys endpoint

2016-10-01T09:11:41+00:00