summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'project-authorizations-diff' into 'master' Nick Thomas2016-12-201-28/+10
|\
| * Smarter refreshing of authorized projectsproject-authorizations-diffYorick Peterse2016-12-191-28/+10
* | remove build_user from model UserArsenev Vladislav2016-12-181-4/+0
|/
* Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' into...Sean McGivern2016-12-171-1/+1
|\
| * Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741Rydkin Maxim2016-12-161-1/+1
* | Fix sort functionality for group/project membersDouglas Barbosa Alexandre2016-12-161-2/+4
|/
* Be smarter when finding a sudoed user in API::Helpers25482-fix-api-sudoRémy Coutable2016-12-131-4/+0
* If SSH prototol is disabled don't say the user requires SSH keysAndrew Smith2016-12-011-1/+1
* Merge branch 'refresh-authorizations-with-lease' into 'master' Douwe Maan2016-11-281-21/+15
|\
| * Refresh project authorizations using a Redis leaserefresh-authorizations-with-leaseYorick Peterse2016-11-251-21/+15
* | Merge branch 'events-cache-invalidation' into 'master' Douwe Maan2016-11-281-14/+0
|\ \ | |/ |/|
| * Remove event caching codeYorick Peterse2016-11-231-14/+0
* | Merge branch 'dz-allow-nested-group-routing' into 'master' Douwe Maan2016-11-241-1/+5
|\ \
| * | Add nested groups support to the routingdz-allow-nested-group-routingDmitriy Zaporozhets2016-11-231-1/+5
| |/
* | Change personal projects access level to master in User#project_authorization...Ahmad Sherif2016-11-231-1/+1
|/
* Merge branch 'remove-unnecessary-self-from-user-model' into 'master' Rémy Coutable2016-11-211-54/+53
|\
| * Remove unnecessary self from user modelSemyon Pupkov2016-11-191-54/+53
* | Merge branch 'feature/precalculate-authorized-projects' into 'master' Douwe Maan2016-11-181-16/+50
|\ \ | |/ |/|
| * Precalculate user's authorized projects in databaseAhmad Sherif2016-11-181-16/+50
* | Merge branch 'chat-name-authorize' into 'master' Rémy Coutable2016-11-171-0/+1
|\ \ | |/ |/|
| * Create relation between chat user and GitLab user and allow to authorize them...Kamil Trzcinski2016-11-161-0/+1
* | fix "Without projects" filterBen Bodenmiller2016-11-161-1/+1
|/
* Merge branch 'use-separate-token-for-incoming-email' into 'master' Douwe Maan2016-11-081-1/+11
|\
| * implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-emailtiagonbotelho2016-11-071-1/+1
| * Use separate email-friendly token for incoming email and let incomingDouwe Maan2016-11-071-1/+11
* | Add User#projects_with_reporter_access_limited_toYorick Peterse2016-11-071-0/+10
|/
* Fix: Todos Filter Shows All Users22588-todos-filter-shows-all-usersValery Sizov2016-11-041-0/+1
* Allow to search for user by secondary email address in the admin interfaceYar2016-11-011-0/+18
* Merge branch 'master' into 5905-duplicate-email-errorsSteve Halasz2016-10-271-5/+5
|\
| * Merge branch '23662-issue-move-user-reference-exception' into 'master' Douwe Maan2016-10-251-1/+1
| |\
| | * Fix `User#to_reference`23662-issue-move-user-reference-exceptionTimothy Andrew2016-10-251-1/+1
| * | Remove redundant class_name and foreign_key overridesDavid Wagner2016-10-241-4/+4
| |/
* | Only show one error message for an invalid emailSteve Halasz2016-10-271-1/+3
|/
* Add a safeguard in User#set_projects_limitnew-gitlab-users-clear_all_authentication_tokens-taskRémy Coutable2016-10-111-0/+5
* Update user whitelist reject messagemrchrisw/remove-whitelistdev-chris2016-10-071-1/+1
* Refactor Gitlab::IdentifierYorick Peterse2016-10-051-0/+5
* Restrict failed login attempts for users with 2FASean McGivern2016-10-041-0/+16
* Project tools visibility levelFelipe Artur2016-09-011-1/+1
* remove Ability.abilitieshttp://jneen.net/2016-08-301-5/+1
* Show "Create Merge Request" widget for push events to fork projects on the so...Paco Guzman2016-08-241-2/+2
* Move to project dropdown with infinite scroll for better performance17932-move-to-project-dropdown-improvePaco Guzman2016-08-171-0/+7
* Use cache for todos counter calling TodoServicePaco Guzman2016-08-121-2/+2
* Store OTP secret key in secrets.ymlSean McGivern2016-08-031-2/+2
* Merge branch '18586-user-authorized_projects-is-slow' into 'master' Yorick Peterse2016-07-201-0/+2
|\
| * Refactor user authorization check for a single project to avoid querying all ...Alejandro Rodríguez2016-07-201-0/+2
* | Merge branch 'email-domain-blacklist' into 'master' Robert Speicher2016-07-201-24/+37
|\ \ | |/ |/|
| * Refactor `match_domain` to a predicate: `domain_matches?`Patricio Cano2016-07-181-3/+3
| * Refactor and rename `restricted_signup_domains` to `domain_whitelist` to bett...Patricio Cano2016-07-181-1/+1
| * Make sure email domain validation method is private.Patricio Cano2016-07-181-28/+26
| * Fixed `signup_domain_valid?` flow and added documentation.Patricio Cano2016-07-181-18/+19