summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-n-plus-one-when-getting-notification-settings-for-recipient...Yorick Peterse2018-04-091-11/+11
|\
| * Add cop for has_many :through without disabled autoloadingfix-n-plus-one-when-getting-notification-settings-for-recipientsSean McGivern2018-04-091-8/+8
| * Use Goldiloader for handling N+1 queriesYorick Peterse2018-04-091-3/+3
* | Remove unused User#manageable_group_projects (#41981)Dylan Griffith2018-04-091-4/+0
* | Use project_authorizations instead of members to calculate manageable CI proj...Dylan Griffith2018-04-091-13/+1
* | Allow group owner to enable runners from subgroups (#41981)Dylan Griffith2018-04-091-5/+12
|/
* Remove unused method.Andreas Brandl2018-04-061-6/+0
* Cache personal projects count.Andreas Brandl2018-04-061-4/+17
* Deleting a MR you are assigned to should decrements counterm b2018-04-051-5/+0
* Ensure internal users (ghost, support bot) get assigned a namespacedm-internal-user-namespaceDouwe Maan2018-04-051-1/+3
* [Rails5] Rename `sort` methods to `sort_by_attribute`blackst0ne2018-04-041-1/+1
* Merge branch 'dm-deploy-keys-default-user' into 'master'Sean McGivern2018-03-291-5/+2
|\
| * Don’t delete deploy key when user who created it is deletedDouwe Maan2018-03-281-5/+2
* | 'Assigned Issues' and 'Assigned Merge Requests' as dashboard user choicesElias Werberich2018-03-271-1/+1
* | Improves User#owned_projects query performanceTiago Botelho2018-03-261-3/+10
|/
* Merge branch '40525-listing-user-activity-timeouts' into 'master'Yorick Peterse2018-03-081-1/+3
|\
| * Leverage user_contributed_projects to find recent events.40525-listing-user-activity-timeoutsAndreas Brandl2018-03-071-1/+3
* | Don't delete todos or unassign issues and MRs when a user leaves a projectunassign-when-leavingDouwe Maan2018-03-071-13/+23
|/
* Extract method User#authorizations_for_projects.42877-fix-visibility-change-performanceAndreas Brandl2018-03-021-0/+9
* Merge branch 'feature/move_oauth_modules_to_auth_dir_structure' into 'master'Douwe Maan2018-03-011-1/+1
|\
| * Moved o_auth/saml/ldap modules under gitlab/authHoratiu Eugen Vlad2018-02-281-1/+1
* | Merge branch '43304-simplify-filtering-non-human-users' into 'master'Yorick Peterse2018-02-271-1/+1
|\ \ | |/ |/|
| * Simplify filtering of non-human users (like ghosts).43304-simplify-filtering-non-human-usersAndreas Brandl2018-02-261-1/+1
* | Optimise searching for users using short queriesYorick Peterse2018-02-221-2/+2
|/
* Don't attempt to update user tracked fields if database is in read-onlysh-guard-read-only-user-updatesStan Hu2018-02-171-0/+2
* Strip whitespace from username/login value for user lookupPeter Lauck2018-02-131-1/+1
* Merge branch 'feature/oidc-groups-claim' into 'master'Douwe Maan2018-02-081-1/+6
|\
| * Add groups to OpenID Connect claimsHassan Zamani2018-02-081-1/+6
* | Validate User username only on Namespace, and bubble up appropriatelyDouwe Maan2018-02-061-3/+1
* | Validate path uniqueness only on Route, and bubble up appropriatelyDouwe Maan2018-02-061-14/+8
* | Validate user namespace before saving so that errors persist on modeldm-user-namespace-route-path-validationDouwe Maan2018-02-061-12/+6
* | Merge branch '26468-fix-admin-recent-sign-in' into 'master'Rémy Coutable2018-02-061-2/+2
|\ \
| * | Using correct column for sorting users by Recent Sign-inPoornima2018-02-051-2/+2
| |/
* | Add foreign keys to todos table.Andreas Brandl2018-02-051-1/+1
|/
* Merge branch 'master' into persistent-calloutsMatija Čupić2018-02-021-26/+12
|\
| * use Gitlab::UserSettings directly as a singleton instead of including/extendi...Mario de la Ossa2018-02-021-10/+8
| * port of 594e6a0a625^..f74c90f68c6Micaël Bergeron2018-02-011-14/+2
| * Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-011-2/+2
* | Rename Callout to UserCalloutMatija Čupić2018-02-021-1/+1
* | Add Callout modelMatija Čupić2018-01-261-0/+1
|/
* Yield no results for blank searches on User name, username and emailMark Fletcher2018-01-211-0/+4
* Log and send a system hook if a blocked user fails to loginsh-log-when-user-blockedStan Hu2018-01-141-3/+5
* Merge branch 'mdelaossa/gitlab-ce-31995-project-limit-default-fix'Dmitriy Zaporozhets2018-01-041-4/+1
|\
| * User#projects_limit remove DB default and added NOT NULL constraintMario de la Ossa2017-12-301-4/+1
* | Fix user membership destroy relationFrancisco Javier López2018-01-021-3/+3
|/
* Add BlocksJsonSerialization model concern and include it in UserRobert Speicher2017-12-191-0/+1
* Make sure user email is read only when synced with LDAPDouwe Maan2017-12-151-1/+1
* Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'Winnie Hellmann2017-12-111-4/+11
|\
| * Resolve conflicts in app/models/user.rbmk-pick-10-2-4-security-fixesDouwe Maan2017-12-111-27/+7
| * Merge branch 'bvl-10-2-email-disclosure' into 'security-10-2'Douwe Maan2017-12-081-0/+27
View Lorry Controller Status