| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Make /profile/keys/new redirects to /profile/keys for back-compat | Rémy Coutable | 2016-04-15 | 1 | -1/+11 |
| | | | | | | | Report: https://github.com/gitlabhq/gitlabhq/issues/10138 Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Revert "Merge branch 'avatar-cropping' into 'master' "revert-avatar-cropping | Rémy Coutable | 2016-03-15 | 1 | -1/+1 |
| | | | | | | This reverts commit 01160fc06182de89c400af174861f6545ad6ceb8, reversing changes made to 4bff9daf8b6d85e9c78565e21cfaa3f6d36f0282. | ||||
| * | Add `:with_avatar` trait to User factory | Robert Speicher | 2016-02-24 | 1 | -1/+1 |
| | | |||||
| * | Move a few controller specs to their correct locationsrs-move-controller-specs | Robert Speicher | 2016-02-18 | 1 | -0/+70 |
| | | |||||
| * | Bump devise-two-factor to 2.0.0rs-bump-two-factor | Robert Speicher | 2015-09-19 | 1 | -2/+2 |
| | | | | | | | Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605 See https://github.com/tinfoil/devise-two-factor/pull/43 | ||||
| * | Add User#disable_two_factor!rs-disable-2fa | Robert Speicher | 2015-07-10 | 1 | -10/+3 |
| | | | | | | This method encapsulates all the logic for disabling 2FA on a specific User model. | ||||
| * | Fix Style/SpaceInsideHashLiteralBraces cop violations | Robert Speicher | 2015-06-22 | 1 | -1/+1 |
| | | | | | These fixes were performed automatically by Rubocop's `-a` flag. | ||||
| * | Use User#two_factor_enabled instead of otp_required_for_loginrs-dev-issue-2415 | Robert Speicher | 2015-06-19 | 1 | -4/+4 |
| | | |||||
| * | Spec the failure cases for PreferencesController#update | Robert Speicher | 2015-06-13 | 1 | -2/+18 |
| | | |||||
| * | Add `dashboard` attribute to User model | Robert Speicher | 2015-06-13 | 1 | -0/+2 |
| | | |||||
| * | Add Profiles::PreferencesController | Robert Speicher | 2015-06-13 | 1 | -0/+70 |
| | | |||||
| * | Bump secret key length to 32rs-manual-2fa-entry | Robert Speicher | 2015-05-23 | 1 | -1/+1 |
| | | |||||
| * | Add support for manually entering 2FA details | Robert Speicher | 2015-05-23 | 1 | -2/+5 |
| | | |||||
| * | Merge branch 'fix-avatar-removal' into 'master' | Hannes Rosenögger | 2015-05-12 | 1 | -0/+17 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where avatar filenames were not actually deleted from the database during removal This would result in a 404 error in certain views. The `save` call was being rolled back due to an error in the validation step. Relax the validation step so that this works. Closes #1570 See merge request !620 | ||||
| | * | Fix bug where avatar filenames were not actually deleted from the database ↵ | Stan Hu | 2015-05-07 | 1 | -0/+17 |
| | | | | | | | | | | | | during removal. This would result in a 404 error in certain views. The `save` call was being rolled back due to an error in the validation step. Relax the validation step so that this works. Closes #1570 | ||||
| * | Clear all 2FA-related fields when user disables the feature | Robert Speicher | 2015-05-09 | 1 | -0/+126 |
