summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Expand)AuthorAgeFilesLines
* Backport https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1942Lin Jen-Shin2017-06-061-1/+1
* Refactor the DeleteUserWorkerNick Thomas2017-06-051-0/+5
* Merge branch '33215-fix-hard-delete-of-users' into 'master'Douwe Maan2017-06-021-5/+1
|\
| * Fix hard-deleting users when they have authored issuesNick Thomas2017-06-021-5/+1
* | Merge branch 'dm-gravatar-username' into 'master'Sean McGivern2017-06-011-1/+1
|\ \ | |/ |/|
| * Add username parameter to gravatar URLDouwe Maan2017-06-011-1/+1
* | Merge branch 'document-not-using-serialize' into 'master'Douwe Maan2017-06-011-1/+1
|\ \
| * | Added Cop to blacklist the use of serializedocument-not-using-serializeYorick Peterse2017-05-311-1/+1
* | | Don't match email addresses or foo@bar as user referencesdm-emails-are-not-user-referencesDouwe Maan2017-05-311-0/+1
* | | Remove some deprecated methodstc-improve-project-api-perfToon Claes2017-05-301-6/+0
* | | Add starred_by scope to ProjectToon Claes2017-05-301-1/+1
|/ /
* | Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-291-21/+13
|\ \
| * | Hide nested group UI/API support for MySQLYorick Peterse2017-05-171-2/+0
| * | Use CTEs for nested groups and authorizationsYorick Peterse2017-05-171-21/+15
* | | Set "expire_in" for counters cacheValery Sizov2017-05-261-2/+2
| |/ |/|
* | Merge branch 'revert-b0498c17' into 'master'Robert Speicher2017-05-251-1/+1
|\ \
| * | Revert "Remove changes that are not absolutely necessary"Douwe Maan2017-05-241-1/+1
* | | ensure rss token on readAlexis Reigel2017-05-241-1/+8
* | | add rss_token attribute to user modelAlexis Reigel2017-05-241-1/+2
|/ /
* | Remove readme project_view optionDouwe Maan2017-05-191-2/+7
* | Use Namespace.for_user scope (formerly known as Namespace.root)mk-fix-issue-1843Douwe Maan2017-05-181-4/+2
* | Fixes #32474Michael Kozono2017-05-171-1/+3
* | Invalidate cache for issue and MR counters more granularlycounters_cache_invalidationValery Sizov2017-05-151-1/+9
|/
* Move update_assignee_cache_counts to the serviceValery Sizov2017-05-121-0/+5
* Use relative paths for group/project/user avatarsblackst0ne2017-05-101-6/+5
* Merge branch 'tc-cache-trackable-attributes' into 'master' Douwe Maan2017-05-091-0/+11
|\
| * Devise can assign trackable fields, but only allow writes once/hourtc-cache-trackable-attributesToon Claes2017-05-081-4/+5
| * Limit `update_tracked_fields` to write to database once/hourToon Claes2017-05-081-0/+10
* | Fix sub-second timing comparison error for Devise confirmation periodsh-fix-almost-there-spec-mysqlStan Hu2017-05-071-0/+9
|/
* Merge branch '17361-redirect-renamed-paths' into 'master' Sean McGivern2017-05-061-0/+9
|\
| * Resolve discussionsMichael Kozono2017-05-051-0/+4
| * Resolve discussionsMichael Kozono2017-05-051-1/+1
| * Redirect from redirect routes to canonical routesMichael Kozono2017-05-051-0/+5
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ...Valery Sizov2017-05-051-0/+1
|\ \ | |/
| * First round of updates from the code review.Ruben Davila2017-05-021-0/+1
* | [Multiple issue assignees] Resolving conflictsValery Sizov2017-05-041-1/+0
* | Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-041-0/+5
|/
* Rename `NamespaceValidator` to `DynamicPathValidator`Bob Van Landuyt2017-05-011-1/+1
* Skip validation when creating internal (ghost, service desk) usersdm-fix-ghost-user-validationDouwe Maan2017-04-261-1/+3
* 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