delta/gitlab/gitlab-ce.git/app/controllers/concerns, branch patch-6 gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'restrict-failed-2fa-attempts' into 'master' 2016-10-04T15:04:57+00:00 Rémy Coutable remy@rymai.me 2016-10-04T15:04:57+00:00 b8005b6112d7322ff8b2cf0a1e55e6c56f0fcba3 Restrict failed login attempts from users with 2FA enabled. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19799. See merge request !6668 

Restrict failed login attempts from users with 2FA enabled.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19799.

See merge request !6668
 Restrict failed login attempts for users with 2FA 2016-10-04T14:01:38+00:00 Sean McGivern sean@gitlab.com 2016-09-02T13:30:19+00:00 194fbc3c3d4b068f191fca75488b986df88c5333 Copy logic from `Devise::Models::Lockable#valid_for_authentication?`, as our custom login flow with two pages doesn't call this method. This will increment the failed login counter, and lock the user's account once they exceed the number of failed attempts. Also ensure that users who are locked can't continue to submit 2FA codes. 
Copy logic from `Devise::Models::Lockable#valid_for_authentication?`, as
our custom login flow with two pages doesn't call this method. This will
increment the failed login counter, and lock the user's account once
they exceed the number of failed attempts.

Also ensure that users who are locked can't continue to submit 2FA
codes.
Merge branch 'rc-improve-members-destroy-service' into 'master' 2016-10-04T10:50:21+00:00 Robert Speicher robert@gitlab.com 2016-10-04T10:50:21+00:00 ef24c62593dd7ca8bae7fd0150f394b741f9d246 Improve `Members::DestroyService` Part of #21979. See merge request !6267 

Improve `Members::DestroyService`

Part of #21979.

See merge request !6267
 Fix a few things after the initial improvment to Members::DestroyService 2016-10-03T14:57:48+00:00 Rémy Coutable remy@rymai.me 2016-09-09T16:51:31+00:00 c8b1311934935c7ac7fd901558e19ac496fbad2c Signed-off-by: Rémy Coutable <remy@rymai.me> 
Signed-off-by: Rémy Coutable <remy@rymai.me>
Improve Members::DestroyService 2016-10-03T14:57:48+00:00 Rémy Coutable remy@rymai.me 2016-07-28T17:31:17+00:00 3158f57dba6dcef3e586ae8fced7deb6fdbd6dc0 Signed-off-by: Rémy Coutable <remy@rymai.me> 
Signed-off-by: Rémy Coutable <remy@rymai.me>
Enable Lint/StringConversionInInterpolation cop and autocorrect offenses 2016-10-03T14:09:57+00:00 Robert Speicher rspeicher@gmail.com 2016-10-03T14:09:57+00:00 4a191c83d1db31aac16241dbf99ac45088efb99a 






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

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

Douwe Maan
douwe@gitlab.com

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

166c6cd85c2be13bb2fa5d27f40d304ffd9c62ad


New `Members::ApproveAccessRequestService`

Part of #21979.

## Does this MR meet the acceptance criteria?

- [x] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !6266





New `Members::ApproveAccessRequestService`

Part of #21979.

## Does this MR meet the acceptance criteria?

- [x] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !6266






Ensure Members::ApproveAccessRequestService can fin a requester by ID
2016-09-22T13:50:48+00:00

Rémy Coutable
remy@rymai.me

2016-09-09T16:06:36+00:00

5dcdf1d51bbd5bde4ea9417dd4402571608c90f0

Signed-off-by: Rémy Coutable <remy@rymai.me>





Signed-off-by: Rémy Coutable <remy@rymai.me>







New Members::ApproveAccessRequestService
2016-09-22T13:50:47+00:00

Rémy Coutable
remy@rymai.me

2016-07-28T17:30:34+00:00

b3f0a82f501ce26717a6f9e57d91cb2b1f1a967b

Signed-off-by: Rémy Coutable <remy@rymai.me>





Signed-off-by: Rémy Coutable <remy@rymai.me>







Revert part of "Merge branch 'update_issues_mr_counter' into 'master'
2016-09-22T13:43:43+00:00

Rémy Coutable
remy@rymai.me

2016-09-22T13:23:01+00:00

d4e91b22fcef64cef412eb81086ef1c90ca55f22

Signed-off-by: Rémy Coutable <remy@rymai.me>





Signed-off-by: Rémy Coutable <remy@rymai.me>