summaryrefslogtreecommitdiff
path: root/app/controllers/profiles
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-171-15/+3
|\ | | | | | | | | | | | | | | | | | | | | Implement custom notification level options ![Screen_Shot_2016-06-17_at_15.31.43](/uploads/3fc47d2f461b3e8b67bb8acaa304cf99/Screen_Shot_2016-06-17_at_15.31.43.png) ![Screenshot_from_2016-06-15_10-52-27](/uploads/88dbdd21d97e80ee772fe08fa0c9b393/Screenshot_from_2016-06-15_10-52-27.png) part of #12758 See merge request !4389
| * Merge master into issue_12758issue_12758Felipe Artur2016-06-171-0/+42
| |\
| * | Re-use notifications dropdown on user profileFelipe Artur2016-06-161-15/+3
| | |
* | | Merge branch 'disable-saml-account-unlink' into 'master' Robert Speicher2016-06-171-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | Disable the unlink feature for SAML connected accounts (social login). This disables the ability to manually unlink your SAML account, if you have one connected. In certain scenarios, the only allowed login mechanism can be SAML, and if you unlink your account you will be locked out of the system (configuration dependent). Fixes #18613 See merge request !4662
| * | Disable the unlink feature for SAML connected accounts (social login).Patricio Cano2016-06-141-1/+1
| |/
* | Implement @DouweM's feedback.Timothy Andrew2016-06-161-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | - Extract a duplicated `redirect_to` - Fix a typo: "token", not "certificate" - Have the "Expires at" datepicker be attached to a text field, not inline - Have both private tokens and personal access tokens verified in a single "authenticate_from_private_token" method, both in the application and API. Move relevant logic to `User#find_by_personal_access_token` - Remove unnecessary constants relating to API auth. We don't need a separate constant for personal access tokens since the param is the same as for private tokens.
* | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-141-5/+18
|\ \ | |/
| * Remove notification level fild from users, improve migrations and specsissue_3359_2Felipe Artur2016-06-101-8/+5
| |
| * Remove notification level from user modelFelipe Artur2016-06-101-4/+20
| |
* | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-091-6/+39
|\ \ | |/
| * Implement U2F registration.Timothy Andrew2016-06-061-6/+39
| | | | | | | | | | | | | | | | | | | | | | - 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
* | Implement @jschatz1's comments.Timothy Andrew2016-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - No hardcoded colors in any SCSS file except `variables.scss` - Don't allow choosing a date in the past - Use the same table as in the "Applications" tab - The button should say "Create Personal Access Token" - Float the revoke button to the right of the table cell - Change the revocation message to be more explicit. - Date shouldn't look selected on page load - Don't use a panel for the created token - Use a normal flash for "Your new personal access token has been created" - Show the input (with the token) below it full width. - Put the "Make sure you save it - you won't be able to access it again." message near the input - Have the created token's input highlight all on single click
* | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-032-2/+2
|\ \ | |/
| * Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'Dmitriy Zaporozhets2016-05-182-2/+2
| |\ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * Change deprecated usage of rendering without response bodyMehmet Emin İNAÇ2016-03-162-2/+2
| | | | | | | | | | | | | | | `render nothing: true` has been deprecated. For more information see [pr](https://github.com/rails/rails/pull/20336)
* | | Display appropriate errors when personal access token creation/revocation fails.Timothy Andrew2016-06-031-3/+9
| | |
* | | Only show a personal access token right after its creation.Timothy Andrew2016-06-021-1/+2
| | |
* | | Fix minor issues with the personal access tokens implementation.Timothy Andrew2016-06-011-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Use the `:personal_access_token` param root instead of `personal_access_token_params`, because we aren't using the `personal_access_token` param for authentication anymore (we're using `private_token` instead). - Use `build` to instantiate a `PersonalAccessToken` - Use better-formatted dates
* | | Make fixes based on @vsizov's comments on MR !3749Timothy Andrew2016-04-281-4/+0
| | |
* | | Change the root param while creating personal access tokens.Timothy Andrew2016-04-281-1/+3
| | | | | | | | | | | | | | | | | | - Can't use `personal_access_token` anymore, because the contents of that param are assumed to be a token string, and authenticated against.
* | | Add an "Inactive Personal Access Tokens" section.Timothy Andrew2016-04-281-1/+2
| | | | | | | | | | | | | | | | | | - Show the count for each section in parens - Remove the `revoked?` check, because everything in the active section is guaranteed to not be revoked.
* | | Add an entry for Personal Access Tokens in the sidebar.Timothy Andrew2016-04-281-1/+1
| | |
* | | Allow expiration of personal access tokens.Timothy Andrew2016-04-281-1/+1
| | |
* | | Allow revoking personal access tokens.Timothy Andrew2016-04-281-1/+15
| | |
* | | Allow creating Personal Access Tokens through the website.Timothy Andrew2016-04-281-0/+22
|/ /
* | Make /profile/keys/new redirects to /profile/keys for back-compatRémy Coutable2016-04-151-0/+5
| | | | | | | | | | | | Report: https://github.com/gitlabhq/gitlabhq/issues/10138 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Change how notification settings in profile are rendered and updatedDmitriy Zaporozhets2016-03-301-22/+6
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix few bugs related to recent notifications refactoringDmitriy Zaporozhets2016-03-301-1/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Introduce NotificationSetting to user interfaceDmitriy Zaporozhets2016-03-301-9/+5
|/ | | | | | | | * visiting project will create notification setting if missing * change notification setting per project even without membership * use notification settings instead of membership on profile page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Don't abuse the flash store for displaying SSH Key form errorsRobert Speicher2016-03-031-2/+3
|
* Remove `Profile::KeysController#new` actionRobert Speicher2016-03-031-4/+0
|
* Fixed failing ssh key testsPhil Hughes2016-03-031-1/+1
|
* SSH keys settingsPhil Hughes2016-03-031-2/+3
| | | | Closes #13860
* Don't show any "2FA required" message if it's not actually requiredrs-improve-grace-periodRobert Speicher2016-02-291-5/+7
| | | | | | | Prior, if the user had enabled and then disabled 2FA, they would be shown a "You must enable Two-factor Authentication for your account." message when going back to re-activate it, even if 2FA enforcement was disabled.
* Update wording for 2FA requirement noticers-2fa-requirement-wordingRobert Speicher2016-01-231-2/+2
|
* Fixed codestyle and added 2FA documentationfeature/force-tfaGabriel Mazetto2015-12-241-1/+3
|
* specs for forced two-factor authentication and grace periodGabriel Mazetto2015-12-241-1/+8
| | | | simplified code and fixed stuffs
* Grace period support for TFAGabriel Mazetto2015-12-241-1/+13
|
* WIP require two factor authenticationGabriel Mazetto2015-12-241-0/+2
|
* Redirect to a default path if HTTP_REFERER is not setStan Hu2015-10-201-1/+1
| | | | | | | | | | Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode, and it's possible load balancers/proxies strip the HTTP_REFERER from the request header. In these cases, default to some default path. Closes #3122 Closes https://github.com/gitlabhq/gitlabhq/issues/9731
* added user preference to change layout widthPeter Göbel2015-10-051-0/+1
|
* Bump devise-two-factor to 2.0.0rs-bump-two-factorRobert Speicher2015-09-191-1/+1
| | | | | | Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605 See https://github.com/tinfoil/devise-two-factor/pull/43
* Allow user to specify content he wants to see on project pageproject-default-viewDmitriy Zaporozhets2015-07-131-0/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add User#disable_two_factor!rs-disable-2faRobert Speicher2015-07-101-7/+1
| | | | | This method encapsulates all the logic for disabling 2FA on a specific User model.
* Use User#two_factor_enabled instead of otp_required_for_loginrs-dev-issue-2415Robert Speicher2015-06-191-2/+2
|
* Prefix 2FA issuer with the GitLab host (e.g., 'dev.gitlab.org')rs-dev-issue-2373Robert Speicher2015-06-161-1/+5
|
* Spec the failure cases for PreferencesController#updateRobert Speicher2015-06-131-4/+9
|
* Add `dashboard` attribute to User modelRobert Speicher2015-06-131-0/+1
|
* Move the "Design" templates and logic to PreferencesRobert Speicher2015-06-131-1/+4
|
* Add Profiles::PreferencesControllerRobert Speicher2015-06-131-0/+29
|
View Lorry Controller Status