summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Expand)AuthorAgeFilesLines
* 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
* Add readme only option as project viewAnnabel Dunstone Gray2017-10-161-7/+3
* Merge branch 'tc-geo-read-only-idea' into 'master'Douwe Maan2017-10-071-0/+8
|\
| * Create idea of read-only databasetc-geo-read-only-ideaToon Claes2017-10-061-0/+8
* | Find forks within users/namespaces using fork membershipsBob Van Landuyt2017-10-071-9/+1
* | Show confirmation modal before deleting accountWinnie Hellmann2017-10-061-0/+4
|/
* Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_e...Douwe Maan2017-10-051-6/+18
|\
| * Merge branch 'enhance-logging' into 'master'Robert Speicher2017-10-021-0/+6
| |\
| | * Remove lock reason and add guard clauseBrian Neel2017-09-291-1/+1
| | * Merge conflict resolutionBrian Neel2017-09-271-6/+6
| | * # This is a combination of 1 commit.Brian Neel2017-09-271-0/+6
| * | Merge branch '33493-attempt-to-link-saml-users-to-ldap-by-email' into 'master'Douwe Maan2017-10-021-1/+5
| |\ \
| | * | Refactors SAML identity creation in gl_user.Tiago Botelho2017-10-021-1/+5
| | |/
| * | Support custom attributes on usersMarkus Koller2017-09-281-0/+2
| * | refactor emails servicerefactor-servicesJames Lopez2017-09-281-2/+2
| * | refactor users update serviceJames Lopez2017-09-281-3/+3
| * | refactor services to match EE signatureJames Lopez2017-09-281-5/+5
| |/
View Lorry Controller Status