summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Expand)AuthorAgeFilesLines
* 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
* | expire todo count calculations to be consistent withbw-todo-count-expirationBrett Walker2017-12-081-2/+2
|/
* Resolve "Display member role per project"Mike Greiling2017-12-071-0/+29
* Consistently schedule Sidekiq jobsdm-application-workerDouwe Maan2017-12-051-0/+2
* Merge branch 'sh-optimize-groups-api' into 'master'Douwe Maan2017-12-041-1/+5
|\
| * Comments from code review applied. Also switched forked_from_project and Fork...Francisco Lopez2017-12-011-1/+5
* | Added default order to UserFinderFrancisco Javier López2017-12-041-1/+5
|/
* Use fuzzy search with minimum length of 3 characters where appropriatedm-search-patternDouwe Maan2017-11-271-15/+9
* Use Gitlab::SQL::Pattern where appropriateDouwe Maan2017-11-241-1/+1
* Merge branch 'jk-group-mentions-fix' into 'master'Sean McGivern2017-11-231-1/+1
|\
| * Fix link text from group contextJarka Kadlecova2017-11-231-1/+1
* | Allow password authentication to be disabled entirelyMarkus Koller2017-11-231-4/+20
|/
* Skip confirmation user apiDaniel Juarez2017-11-211-0/+4
* Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable2017-11-201-0/+2
|\
| * Adds Rubocop rule for line break after guard clauseJacopo2017-11-161-0/+2
* | Changing OAuth lookup to be case insensitiveFrancisco Javier López2017-11-171-2/+1
* | Cache the number of user SSH keyscache-user-keys-countYorick Peterse2017-11-161-1/+8
|/
* Include child projects a user can manage in namespace dropdownsBob Van Landuyt2017-11-141-1/+10
* Rewrite the GitHub importer from scratchYorick Peterse2017-11-071-0/+5
* Refactor User.find_by_any_emailYorick Peterse2017-11-071-9/+9
* Merge branch 'dm-block-group-and-project-creation-when-external-by-default' i...Sean McGivern2017-11-061-3/+4
|\
| * Make sure group and project creation is blocked for new users that are extern...Douwe Maan2017-11-061-3/+4
* | Reallow project paths ending in periodsdm-reallow-project-path-ending-in-periodDouwe Maan2017-11-061-1/+1
|/
* Add system hooks user_rename and group_renameWinnie Hellmann2017-11-031-0/+5
* Remove user authentication_token columnDouwe Maan2017-11-021-0/+1
* Remove User#private_tokenDouwe Maan2017-11-021-4/+1
* Fix specAnnabel Dunstone Gray2017-10-161-1/+0
View Lorry Controller Status