summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Expand)AuthorAgeFilesLines
* Drop theme ID from users tableAnnabel Dunstone Gray2017-02-151-1/+0
* Add GFM support to nested groupsdz-nested-groups-gfm-altDmitriy Zaporozhets2017-02-131-1/+1
* Make deploy key not show in User's keys listPawel Chojnacki2017-02-131-1/+6
* Merge branch 'zj-drop-ruby-21-tests' into 'master' Rémy Coutable2017-02-131-1/+1
|\
| * Update Rubocop to ruby 2.3zj-drop-ruby-21-testsZ.J. van de Weg2017-02-071-1/+1
* | Don't perform Devise trackable updates on blocked User recordsrs-warden-blocked-usersRobert Speicher2017-02-101-0/+9
* | Bypass signup domain validation for external usersReza Mohammadi2017-02-081-1/+1
* | Merge branch 'ee-1439-read-only-user' into 'master' Douwe Maan2017-02-071-0/+15
|\ \
| * | Fix indentationee-1439-read-only-userDouwe Maan2017-02-061-4/+4
| * | Backport of the frontend view, including testsJose Ivan Vargas2017-02-061-0/+15
| |/
* | Don't delete assigned MRs/issues when user is deletedDouwe Maan2017-02-061-2/+3
|/
* Merge branch 'dz-nested-groups-access-improvements' into 'master' Dmitriy Zaporozhets2017-01-251-0/+9
|\
| * Add User#nested_groups and User#nested_projects methodsDmitriy Zaporozhets2017-01-251-0/+9
* | Fixing sort of Users so that users who never logged in will be displayed lastPoornima M2017-01-241-2/+2
|/
* Remove the project_authorizations.id columnremove-project-authorizations-id-columnYorick Peterse2017-01-081-2/+2
* Merge branch 'add_email_password_confirmation' into 'master' Douwe Maan2017-01-041-0/+1
|\
| * Add email and password confirmation fields to registration formDrew Blessing2017-01-031-0/+1
* | Fix cross-project references copy to include the project referencefix/cross-project-ref-pathJames Lopez2017-01-031-1/+1
|/
* 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
| |/
View Lorry Controller Status