Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix access token specsfix-specs-for-access-tokens | Sean McGivern | 2017-03-07 | 1 | -2/+2 |
| | | | | | de37dcee90ac44ba794ad504e91f18b8fb4b13a3 was a manual merge, which meant it didn't have a build, so I broke master :-( | ||||
* | Merge branch 'siemens/gitlab-ce-feature/openid-connect' | Sean McGivern | 2017-03-07 | 1 | -21/+7 |
|\ | |||||
| * | Require explicit scopes on personal access tokens | Markus Koller | 2017-03-07 | 1 | -22/+7 |
| | | | | | | | | | | | | Gitlab::Auth and API::APIGuard already check for at least one valid scope on personal access tokens, so if the scopes are empty the token will always fail validation. | ||||
* | | Merge remote-tracking branch ↵ | Douwe Maan | 2017-03-07 | 1 | -4/+25 |
|\ \ | |/ |/| | | | 'origin/personal_access_token_api_and_impersonation_token' | ||||
| * | apply codestyle and implementation changes to the respective feature codepersonal_access_token_api_and_impersonation_token | Tiago Botelho | 2017-03-06 | 1 | -2/+2 |
| | | |||||
| * | refactors documentation and personal access tokens form to not allow admins ↵ | Tiago Botelho | 2017-02-28 | 1 | -6/+2 |
| | | | | | | | | to generate non impersionation tokens | ||||
| * | add impersonation token | Simon Vocella | 2017-02-28 | 1 | -2/+27 |
| | | |||||
| * | manage personal_access_tokens through api | Simon Vocella | 2017-02-28 | 1 | -2/+2 |
| | | |||||
* | | Remove remnants of git annex | Pawel Chojnacki | 2017-03-03 | 1 | -10/+0 |
|/ | |||||
* | Enable Style/WordArray | Douwe Maan | 2017-02-23 | 1 | -2/+2 |
| | |||||
* | Remove all instances of theme_id; require downtime | Annabel Dunstone Gray | 2017-02-15 | 1 | -4/+2 |
| | |||||
* | Merge branch '27480_deploy_keys_should_not_show_up_in_users_keys_list' into ↵ | Douwe Maan | 2017-02-13 | 1 | -10/+9 |
|\ | | | | | | | | | | | | | | | | | | | 'master' Make deploy key not show in User's keys list Closes #27480 See merge request !9024 | ||||
| * | Make deploy key not show in User's keys list | Pawel Chojnacki | 2017-02-13 | 1 | -10/+9 |
| | | |||||
* | | Use `let` in Profiles::NotificationsController spec | Richard Macklin | 2017-02-03 | 1 | -12/+9 |
| | | |||||
* | | Add missing newline in Profiles::NotificationsController spec | Richard Macklin | 2017-02-01 | 1 | -0/+1 |
| | | |||||
* | | Add notified_of_own_activity to permitted attributes | Richard Macklin | 2017-02-01 | 1 | -1/+2 |
| | | | | | | | | in Profiles::NotificationsController#update | ||||
* | | Add controller spec for Profiles::NotificationsController | Richard Macklin | 2017-02-01 | 1 | -0/+46 |
|/ | |||||
* | Add a controller spec for personal access tokens. | Timothy Andrew | 2016-12-16 | 1 | -0/+49 |
| | | | | | | Split the existing feature spec into both feature and controller specs. Feature specs assert on browser DOM, and controller specs assert on database state. | ||||
* | fixes part1 of files to start using active tense | tiagonbotelho | 2016-08-09 | 2 | -10/+10 |
| | |||||
* | Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-lines | Grzegorz Bizon | 2016-07-01 | 1 | -1/+0 |
| | |||||
* | Use HTTP matchers if possible | Z.J. van de Weg | 2016-06-27 | 1 | -1/+1 |
| | |||||
* | Added CHANGELOG item and fixed Rubocop errorsdisable-saml-account-unlink | Patricio Cano | 2016-06-14 | 1 | -4/+2 |
| | |||||
* | Disable the unlink feature for SAML connected accounts (social login). | Patricio Cano | 2016-06-14 | 1 | -0/+28 |
| | |||||
* | Implement U2F registration. | Timothy Andrew | 2016-06-06 | 1 | -7/+7 |
| | | | | | | | | | | | - Move the `TwoFactorAuthsController`'s `new` action to `show`, since the page is not used to create a single "two factor auth" anymore. We can have a single 2FA authenticator app, along with any number of U2F devices, in any combination, so the page will be accessed after the first "two factor auth" is created. - Add the `u2f` javascript library, which provides an API to the browser's U2F implementation. - Add tests for the JS components | ||||
* | 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 |