summaryrefslogtreecommitdiff
path: root/app/controllers/profiles
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'zj-read-registry-pat' into 'master'Kamil Trzciński2017-06-071-1/+1
|\
| * Create read_registry scope with JWT authZ.J. van de Weg2017-06-051-1/+1
* | Add a rubocop rule to check if a method 'redirect_to' is used without explici...31840-add-a-rubocop-that-forbids-redirect_to-inside-a-controller-destroy-action-without-an-explicit-statusblackst0ne2017-06-076-6/+6
|/
* Enable the Style/TrailingCommaInArguments copRémy Coutable2017-05-101-1/+1
* 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
* Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master'Stan Hu2017-03-151-1/+1
* 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 'origin/personal_access_token_api_and_impersonat...Douwe Maan2017-03-071-5/+10
|\ \ | |/ |/|
| * 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
* Merge branch '20492-access-token-scopes' into 'master' Rémy Coutable2016-12-161-6/+6
|\
| * 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
|/
* Remove event caching codeYorick Peterse2016-11-231-1/+0
* 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 them...Kamil Trzcinski2016-11-161-0/+64
* Address review comments from @smcgivern.17334-u2f-device-identifiersTimothy Andrew2016-08-181-2/+1
* Allow naming U2F devices.Timothy Andrew2016-08-182-3/+15
* 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
* Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-171-15/+3
|\
| * 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).Patricio Cano2016-06-141-1/+1
| |/
* | Implement @DouweM's feedback.Timothy Andrew2016-06-161-2/+4
* | 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
* | Implement @jschatz1's comments.Timothy Andrew2016-06-091-1/+1
* | 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
| |\
| | * Change deprecated usage of rendering without response bodyMehmet Emin İNAÇ2016-03-162-2/+2
* | | Display appropriate errors when personal access token creation/revocation fails.Timothy Andrew2016-06-031-3/+9