delta/gitlab/gitlab-ce.git/app/controllers, branch 22964-git-commit-documentation-article

Merge branch 'restrict-failed-2fa-attempts' into 'master'

2016-10-04T15:04:57+00:00


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

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


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

Signed-off-by: Rémy Coutable

Improve Members::DestroyService

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

Signed-off-by: Rémy Coutable

Enable Lint/StringConversionInInterpolation cop and autocorrect offenses

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

Merge branch 'fix/import-export-admin' into 'master'

2016-10-03T11:45:01+00:00


Enable Import/Export for non-admin users

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21315

Related https://gitlab.com/gitlab-org/gitlab-ce/issues/20857 and https://gitlab.com/gitlab-org/gitlab-ce/issues/20821/

See merge request !6080

Enable import/export back for non-admins

2016-10-03T08:53:18+00:00

Add a /wip slash command

2016-10-03T07:36:21+00:00

It toggles the 'WIP' prefix in the MR title.

Merge branch '21744-fix-missing-values-in-linter' into 'master'

2016-09-30T16:51:47+00:00


Add missing values to linter (`only`, `except`) and add new one `Environment`

Closes #21744 

See merge request !6276