summaryrefslogtreecommitdiff
path: root/app/controllers/profiles
Commit message (Collapse)AuthorAgeFilesLines
* state the reason to the user for the required 2faAlexis Reigel2017-04-061-4/+17
|
* Rename skip_tfa session variable to skip_two_factorMarkus Koller2017-04-061-1/+1
|
* Rename check_2fa_requirement to check_two_factor_requirementMarkus Koller2017-04-061-1/+1
|
* Prevent users from disconnecting gitlab account from CASTiago Botelho2017-03-311-1/+12
|
* Revert "Merge branch '8836-mr-revert' into 'master'Stan Hu2017-03-161-1/+1
| | | | | This reverts commit 68e40bd49fde7b790bb31b9ac85a249bedd817d2, reversing changes made to 2d1f823b4c8b60cee525384cb52e547d2be8925a.
* Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master'Stan Hu2017-03-151-1/+1
| | | | | This reverts commit 5e9666880376b3f53edb95cba77b5642d3cc1810, reversing changes made to b35378a938e22f745b6c6ea32b53cb50f9b6c627.
* Merge branch 'siemens/gitlab-ce-feature/openid-connect'Sean McGivern2017-03-071-1/+1
|\
| * Only use API scopes for personal access tokensMarkus Koller2017-03-071-1/+1
| |
* | Merge remote-tracking branch ↵Douwe Maan2017-03-071-5/+10
|\ \ | |/ |/| | | 'origin/personal_access_token_api_and_impersonation_token'
| * apply codestyle and implementation changes to the respective feature codepersonal_access_token_api_and_impersonation_tokenTiago Botelho2017-03-061-12/+8
| |
| * refactors finder and correlated codeTiago Botelho2017-03-011-5/+14
| |
| * applies relevant changes to the code and code structureTiago Botelho2017-02-281-1/+1
| |
* | Remove remnants of git annexPawel Chojnacki2017-03-031-5/+0
|/
* Enable Style/ColonMethodCallDouwe Maan2017-02-231-1/+1
|
* No more and/orDouwe Maan2017-02-211-2/+2
|
* Drop theme ID from users tableAnnabel Dunstone Gray2017-02-151-1/+0
|
* Add notified_of_own_activity to permitted attributesRichard Macklin2017-02-011-1/+1
| | | | in Profiles::NotificationsController#update
* Merge branch '20492-access-token-scopes' into 'master' Rémy Coutable2016-12-161-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add a doorkeeper scope suitable for authentication" ## What does this MR do? - Add a single new scope (in addition to the `api` scope we've had) - `read_user` - Allow creating OAuth applications and Personal access tokens with a scope selected - Enforce scopes in the API ## What are the relevant issue numbers? - Closes #20492 - EE counterpart for this MR: gitlab-org/gitlab-ee!946 See merge request !5951
| * Allow creating personal access tokens / OAuth applications with scopes.Timothy Andrew2016-12-161-6/+6
| |
* | Add GitLab host to 2FA QR and manual infoDrew Blessing2016-12-161-2/+6
|/ | | | | | | | The two factor authentication account string only had the user's email address. This led to ambiguous entries in two factor code generating apps. This adds the GitLab host to the account string in the standard format (according to Google). No matter the code generator this change disambiguates the entry.
* Remove event caching codeYorick Peterse2016-11-231-1/+0
| | | | | | | | | | | | | | | | | | | Flushing the events cache worked by updating a recent number of rows in the "events" table. This has the result that on PostgreSQL a lot of dead tuples are produced on a regular basis. This in turn means that PostgreSQL will spend considerable amounts of time vacuuming this table. This in turn can lead to an increase of database load. For GitLab.com we measured the impact of not using events caching and found no measurable increase in response timings. Meanwhile not flushing the events cache lead to the "events" table having no more dead tuples as now rows are only inserted into this table. As a result of this we are hereby removing events caching as it does not appear to help and only increases database load. For more information see the following comment: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6578#note_18864037
* Add chat_name partialKamil Trzcinski2016-11-171-1/+1
|
* Fix code reviewKamil Trzcinski2016-11-171-1/+1
|
* Improve code design after code reviewKamil Trzcinski2016-11-161-2/+2
|
* Fix `chat_names` before_actionKamil Trzcinski2016-11-161-1/+1
|
* Create relation between chat user and GitLab user and allow to authorize ↵Kamil Trzcinski2016-11-161-0/+64
| | | | them [ci skip]
* Address review comments from @smcgivern.17334-u2f-device-identifiersTimothy Andrew2016-08-181-2/+1
| | | | | | | | 1. Remove an unnecessary (since we're fetching all the records anyway) `pluck` while fetching U2F registration records. 2. Align "Your device was successfully set up!" section with the "U2F Devices" table below.
* Allow naming U2F devices.Timothy Andrew2016-08-182-3/+15
| | | | | | | | 1. Display a list of U2F devices on the `two_factor_auth` page. 2. Allow deleting individual U2F devices. 3. Allow setting a (optional) name for a device (during registration).
* Avoid to show the original password field when password is automatically setedCarlos Ribeiro2016-08-081-0/+1
|
* Load Javascript U2F library selectively.Timothy Andrew2016-07-141-2/+1
| | | | | | | | | | 1. Only on supported Chrome versions 2. Mainly, this lets us simplify the javascript-based U2F check to `window.u2f`, where `window.u2f` can either be loaded from the GitLab server (for Chrome) or from the Firefox extension. 3. This is a better way to provide browser detection for U2F.
* 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.