summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'github-importer-refactor' into 'master'Douwe Maan2017-11-091-9/+14
* 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
| |/
* | spacing and small optimisationsAlexandra2017-10-011-7/+7
* | must now set the devise default scope (since we now have an :email scope)Brett Walker2017-09-241-1/+1
* | add primary email as a secondary email whenever the primary is changedBrett Walker2017-09-231-7/+5
* | more explantion why an `after_update` was replaced with an `after_commit`Brett Walker2017-09-231-2/+4
* | added email.confirmed scope and fix email comparisonBrett Walker2017-09-231-2/+3
* | allow a verified secondary email to be use as the primary withoutBrett Walker2017-09-231-4/+14
* | when a primary email is replaced and added to the secondary emails list,Brett Walker2017-09-231-2/+5
* | small cleanup changes based on feedbackBrett Walker2017-09-231-5/+9
* | Make GPG signature verification work with non-primary email (#36959)Brett Walker2017-09-231-4/+11
|/
* Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-111-0/+1
* Merge branch 'user-recent-push' into 'master'Douwe Maan2017-09-111-13/+6
|\
| * Rework how recent push events are retrieveduser-recent-pushYorick Peterse2017-09-081-13/+6
* | Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-...revert-f2421b2bRubén Dávila2017-09-081-1/+0
|/
* Merge branch '23079-remove-default-scope-in-sortable' into 'master'Douwe Maan2017-09-071-4/+6
|\
| * Removes default scope from sortable23079-remove-default-scope-in-sortableTiago Botelho2017-09-071-4/+6
* | Restore some changes from !9199Rubén Dávila2017-09-061-0/+1
* | Profile updates from providersAlexander Keramidas2017-09-061-1/+21
|/
* add User##verified_email? methodAlexis Reigel2017-09-051-0/+4
* Merge branch 'remove-unused-code' into 'master'Rémy Coutable2017-09-041-9/+0
|\
| * Remove unused `User#projects_limit_percent`Mehdi Lahmam2017-08-201-5/+0
| * Remove `User#projects_sorted_by_activity`Mehdi Lahmam2017-08-201-4/+0
* | Merge branch '37202-revert-changes-to-signing-enabled' into 'master'Douwe Maan2017-09-011-1/+1
|\ \
| * | Rollsback changes made to signing_enabled.Tiago Botelho2017-09-011-1/+1
* | | `current_application_settings` belongs on `Gitlab::CurrentSettings`Sean McGivern2017-08-311-0/+1
* | | Move the logic to a concernHiroyuki Sato2017-08-291-1/+2
* | | Improve AutocompleteController#user.json performanceHiroyuki Sato2017-08-251-1/+1
|/ /
View Lorry Controller Status