summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'uassign_on_member_removing' into 'master' Sean McGivern2017-04-201-8/+5
|\
| * Remove helpers assigned_issuables_count and cached_assigned_issuables_countuassign_on_member_removingValery Sizov2017-04-201-3/+3
| * Remove assigned_(issues|merge_requests) methods from the issuableValery Sizov2017-04-181-5/+2
* | Fix active user countJames Lopez2017-04-191-1/+1
|/
* Remove an unused `cared` scope from Issue and MergeRequestrs-remove-open-for-scopeRobert Speicher2017-04-101-4/+0
* Remove the User#is_admin? methodblackst0ne2017-04-091-4/+0
* Merge branch '28695-move-all-associated-records-to-ghost-user' into 'master' Douwe Maan2017-04-061-1/+2
|\
| * Implement review comments from @DouweM for !10467.28695-move-all-associated-records-to-ghost-userTimothy Andrew2017-04-061-0/+1
| * Fix a bug with the User#abuse_report association.Timothy Andrew2017-04-061-1/+1
* | user#update_two_factor_requirement is publicAlexis Reigel2017-04-061-8/+8
* | rename cache db column with `_cached` suffixAlexis Reigel2017-04-061-1/+1
* | check all groups for 2fa requirementAlexis Reigel2017-04-061-1/+9
* | Support 2FA requirement per-groupMarkus Koller2017-04-061-0/+9
|/
* Remove unnecessary ORDER BY clause from `forked_to_project_id` subquerymhasbini2017-03-301-2/+4
* Merge branch 'sh-bring-back-option-to-be-notified-of-own-activity' into 'mast...Robert Speicher2017-03-271-0/+1
|\
| * Use default_value_for to set notified_of_own_activity instead of using a DB m...Stan Hu2017-03-241-0/+1
* | Implement new service for creating userGeorge Andrinopoulos2017-03-271-18/+3
* | Fix projects_limit RangeError on user createAlexander Randa2017-03-241-1/+3
|/
* Don't try to find a user by personal_access_token if the token is nilRémy Coutable2017-03-221-0/+2
* All CI offline migrationsKamil Trzciński2017-03-171-1/+1
* allow internal attributes to have a nil valuerefactor/global-permissions-for-internal-usershttp://jneen.net/2017-03-101-1/+1
* add .internal and .non_internal scopeshttp://jneen.net/2017-03-091-1/+13
* don't require ghost users to be blockedhttp://jneen.net/2017-03-091-7/+0
* don't require passwords for internal usershttp://jneen.net/2017-03-091-1/+8
* add User#internal? and some global permissionshttp://jneen.net/2017-03-091-1/+4
* use a magic default :global symbol instead of nilhttp://jneen.net/2017-03-091-2/+2
* Merge remote-tracking branch 'origin/personal_access_token_api_and_impersonat...Douwe Maan2017-03-071-2/+1
|\
| * apply codestyle and implementation changes to the respective feature codepersonal_access_token_api_and_impersonation_tokenTiago Botelho2017-03-061-2/+1
* | Add `has_many` associations for models that can have Upload recordsRobert Speicher2017-03-061-0/+1
* | Make triggers to be user awareKamil Trzcinski2017-03-051-0/+1
* | Change default project view for user from readme to files viewdz-change-project-viewDmitriy Zaporozhets2017-03-031-0/+1
* | use a more namespacey key for the exclusive leaserefactor/generalize-unique-internal-usershttp://jneen.net/2017-02-281-1/+1
* | generalize the idea of a "unique internal user"http://jneen.net/2017-02-281-14/+22
|/
* Fix access to projects shared with a nested groupdm-nested-group-shared-projectsDouwe Maan2017-02-281-1/+1
* Merge branch '12726-preserve-issues-after-deleting-users' into 'master' Douwe Maan2017-02-241-1/+54
|\
| * Don't allow deleting a ghost user.Timothy Andrew2017-02-241-1/+3
| * Implement final review comments from @DouweM and @rymaiTimothy Andrew2017-02-241-37/+35
| * Implement review comments from @rymai and @yorickpeterseTimothy Andrew2017-02-241-4/+10
| * Use a `ghost` boolean to track ghost users.Timothy Andrew2017-02-241-5/+10
| * Implement review comments from @DouweM and @nick.thomas.Timothy Andrew2017-02-241-0/+13
| * Extract code from `Namespace#clean_path` for ghost user generation.Timothy Andrew2017-02-241-14/+13
| * Deleting a user shouldn't delete associated issues.Timothy Andrew2017-02-241-1/+31
* | Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-pathDouwe Maan2017-02-231-1/+1
|/
* Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-231-28/+28
* Fix new offensesDouwe Maan2017-02-231-1/+1
* Prefer leading style for Style/DotPositionDouwe Maan2017-02-231-27/+27
* Enable Rails/ValidationDouwe Maan2017-02-231-1/+1
* 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
View Lorry Controller Status