summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Handle password reset for users with 2FA enabled2faRobert Speicher2015-05-113-2/+76
|
* Remove extra `devise` call that got added by accidentRobert Speicher2015-05-101-3/+0
|
* Remove unnecessary User#login accessor overrideRobert Speicher2015-05-091-5/+0
|
* Add CHANGELOG entryRobert Speicher2015-05-091-1/+1
|
* Clear all 2FA-related fields when user disables the featureRobert Speicher2015-05-092-2/+133
|
* Prevent "You are already signed in." error message upon 2FA loginRobert Speicher2015-05-092-3/+26
|
* Move "invalid 2FA code" error message to the flashRobert Speicher2015-05-092-4/+1
| | | | | This makes it consistent with the Invalid email/password error message from the previous step.
* Autofocus the pin field on 2FA enable formRobert Speicher2015-05-091-1/+1
|
* Add otp_attempt to filtered parametersRobert Speicher2015-05-091-1/+1
|
* Generate 10 2FA backup codes instead of the default of 5Robert Speicher2015-05-092-3/+3
|
* Add :two_factor trait to User factoryRobert Speicher2015-05-092-8/+11
|
* Fix 2FA backup code removalRobert Speicher2015-05-092-7/+8
|
* Make otp_backup_codes a text fieldRobert Speicher2015-05-092-1/+6
|
* Quotes, icon helper in profiles/accounts/show viewRobert Speicher2015-05-091-5/+5
|
* Re-annotate User modelRobert Speicher2015-05-092-0/+10
|
* Add a hint on login form about using a recovery codeRobert Speicher2015-05-091-0/+1
|
* Improve copy for enabling 2FARobert Speicher2015-05-092-4/+5
|
* Update copy for generating new recovery codesRobert Speicher2015-05-091-4/+4
|
* Refactor SessionsControllerRobert Speicher2015-05-093-23/+33
| | | | | Also adds test case for providing an invalid 2FA code and then a valid one without re-entering username and password.
* Fix nav and layout for TwoFactorAuthsControllerRobert Speicher2015-05-092-2/+2
|
* Add page titles for two_factor_auths viewsRobert Speicher2015-05-093-0/+6
|
* Make two-factor login work and add a feature specRobert Speicher2015-05-092-7/+106
|
* Update User model for two-factor authRobert Speicher2015-05-091-2/+10
|
* Update login views for two-factor authRobert Speicher2015-05-092-6/+2
|
* Fix Devise parameter sanitizer for otp_attemptRobert Speicher2015-05-091-1/+1
|
* Don't use hard-coded sign_in pathRobert Speicher2015-05-091-1/+1
|
* prepend_before_filter -> prepend_before_actionRobert Speicher2015-05-091-1/+1
|
* Be consistent with what we call the 2FA featureRobert Speicher2015-05-094-11/+13
| | | | "Two-factor" vs. "2-Factor"
* Update copy for recovery codesRobert Speicher2015-05-091-5/+4
|
* Render 2fa recovery codes instead of downloading itDmitriy Zaporozhets2015-05-096-12/+28
|
* Add support for backup codesDmitriy Zaporozhets2015-05-096-14/+42
|
* Use non-broken version of attr_encryptedDmitriy Zaporozhets2015-05-092-2/+10
|
* Turn 2-factor authentication into 2 steps process. Disabled 2fa UI for ldap ↵Dmitriy Zaporozhets2015-05-095-18/+59
| | | | users since it is not supported
* Fix rubocop complainDmitriy Zaporozhets2015-05-093-3/+2
|
* Make 2 factor authentication workDmitriy Zaporozhets2015-05-093-9/+37
|
* Create Two-factor authentication resource for userDmitriy Zaporozhets2015-05-094-0/+48
|
* Init 2 factor authentication for user modelDmitriy Zaporozhets2015-05-094-2/+18
|
* Add 2 factor authentication gemsDmitriy Zaporozhets2015-05-092-0/+20
|
* Merge branch 'rs-disallow-id-class' into 'master'Dmitriy Zaporozhets2015-05-095-36/+59
|\ | | | | | | | | | | | | | | Remove class and id attributes from SanitizationFilter whitelist Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2302 See merge request !631
| * Remove class and id attributes from SanitizationFilter whitelistrs-disallow-id-classRobert Speicher2015-05-085-36/+59
| |
* | Merge pull request #9244 from dreis2211/firefox_issuable_filter_patchDmitriy Zaporozhets2015-05-082-2/+7
|\ \ | | | | | | Fix Firefox problems when it wants to render issuable component
| * | Fix Firefox problems when it wants to render issuable componentdreis2015-05-052-2/+7
| | |
* | | Merge branch 'show_project_visibility' into 'master'Dmitriy Zaporozhets2015-05-082-2/+4
|\ \ \ | |_|/ |/| | | | | | | | | | | Move project visibility from clone bar to repository details block for non empty project. See merge request !1818
| * | Move project visibility from clone bar to repository details block for non ↵Marin Jankovski2015-05-082-2/+4
|/ / | | | | | | empty project.
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-05-0815-31/+132
|\ \
| * \ Merge pull request #9214 from Bugagazavr/hook-eventsValeriy Sizov2015-05-0815-31/+132
| |\ \ | | | | | | | | Added X-GitLab-Event header for web hooks
| | * | Added X-GitLab-Event header for web hooksbugagazavr2015-05-0815-31/+132
| | | |
* | | | Merge branch 'How_to_Reset_your_root_password' into 'master'Job van der Voort2015-05-082-0/+41
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | How to reset your root password Added link and file correctly on Security doc. Please review to make sure it's correct. See merge request !1811
| * | | make it more obvious what happens in the codeJob van der Voort2015-05-081-4/+4
| | | |
| * | | remove redundant colonJob van der Voort2015-05-081-1/+1
| | | |
View Lorry Controller Status