delta/gitlab/gitlab-ce.git/spec/mailers, branch docs-trigger-variable gitlab.com: gitlab-org/gitlab-ce.git refactors tests because of gitlab-test repository changes 2016-10-11T15:33:06+00:00 tiagonbotelho tiagonbotelho@hotmail.com 2016-10-03T12:11:16+00:00 c90483406ecc2717076391737ff57167b5a03393 






override subject method in devise mailer
2016-10-03T10:07:28+00:00

Fu Xu
fuxu@fuxu.name

2016-09-30T09:46:37+00:00

76463c2cb460099559b8544396cf1a6656895e8d












follow the styleguide: Don't use parentheses around a literal
2016-10-03T10:07:28+00:00

Fu Xu
fuxu@fuxu.name

2016-09-29T08:11:40+00:00

064eb2caa671cdd18cd051e49ff2086d004e5516












move spec back into shared example `an email sent from GitLab`
2016-10-03T10:07:28+00:00

Fu Xu
fuxu@fuxu.name

2016-09-28T08:14:47+00:00

048f124a0851a51c449881814dbfd2f2fc2dd32d












stub config settings in spec
2016-10-03T10:07:28+00:00

Fu Xu
fuxu@fuxu.name

2016-09-27T12:18:10+00:00

2a438f452c920e57545add519ed7b7a2c15e660e












remove empty line at block body end
2016-10-03T10:07:28+00:00

Fu Xu
fuxu@fuxu.name

2016-09-27T11:03:24+00:00

89dc70df4614daf95a2284d8171db2a9115ec46e












create new test in `spec/mailers/notify_spec.rb`
2016-10-03T10:07:28+00:00

Fu Xu
fuxu@fuxu.name

2016-09-26T17:06:57+00:00

785094e201a7d3e7c88f9556da8d9539281a36d5












add configurable email subject suffix
2016-10-03T10:07:28+00:00

Fu Xu
fuxu@fuxu.name

2016-09-02T08:57:08+00:00

74c8e091f40c29a59b99bf7864b9fee303c68e50












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

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

Robert Speicher
robert@gitlab.com

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

e64594ac4419a42b84f3ee36388f832e74361c8c


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





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






Merge branch 'rc-new-members-request-access-service' into 'master'

2016-10-02T11:33:06+00:00

Robert Speicher
robert@gitlab.com

2016-10-02T11:33:06+00:00

076e0406390cb03ade887723bceb3a6bb9613986


New `Members::RequestAccessService`

Part of #21979.

See merge request !6265





New `Members::RequestAccessService`

Part of #21979.

See merge request !6265