summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Expand)AuthorAgeFilesLines
* Uniqueness check should be case insensitive for username and path, otherwise ...Marin Jankovski2014-02-201-1/+1
* Add email aliases for usersJason Hollingsworth2014-02-131-0/+13
* code refactor as per standardsGitLab2014-02-111-1/+1
* merge with upstream masterGitLab2014-02-061-34/+78
|\
| * Merge pull request #6075 from skv-headless/remove_deprecated_findersDmitriy Zaporozhets2014-01-221-2/+2
| |\
| | * Remove deprecated findersskv2014-01-191-2/+2
| * | Merge pull request #6072 from jvanbaarsen/fix-3516Dmitriy Zaporozhets2014-01-191-1/+1
| |\ \
| | * | Better check on the validity of emailsJeroen van Baarsen2014-01-161-1/+1
| | |/
| * | Add website url to userJerome Dalbert2014-01-181-2/+13
| |/
| * Add User#email uniq validation. Fixed confirmation for admin/users formDmitriy Zaporozhets2013-12-261-1/+1
| * Fix User#by_username_or_id for postgresDmitriy Zaporozhets2013-12-261-1/+1
| * Dont allow upload of non-image formats for user avatarDmitriy Zaporozhets2013-12-231-2/+7
| * Merge pull request #5849 from bke-drewb/feature/hide_no_ssh_key_messageDmitriy Zaporozhets2013-12-161-1/+2
| |\
| | * Allow user to hide the message to add an ssh key permanentlyDrew Blessing2013-12-141-1/+2
| * | fix most of warningsskv2013-12-151-1/+1
| |/
| * Expire event cache on avatar creation/removalDrew Blessing2013-12-111-0/+14
| * Fix User#by_username_or_id for postgresDmitriy Zaporozhets2013-12-101-1/+1
| * Fixed mistake and mock warningDmitriy Zaporozhets2013-12-101-1/+1
| * Fixed the last deprecation warnings for order and whereJeroen van Baarsen2013-12-101-4/+3
| * Make User#accessible_deploy_keys works in rails4Dmitriy Zaporozhets2013-12-101-1/+1
| * Added allow_blank to model validationsDmitriy Zaporozhets2013-12-101-1/+1
| * AnnotateDmitriy Zaporozhets2013-11-131-0/+5
| * Merge branch 'feature/leave_project' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-11-051-0/+5
| |\
| | * New feature: Ability to leave projectDmitriy Zaporozhets2013-11-051-0/+5
| * | Remove User#namespaces method from codeDmitriy Zaporozhets2013-11-051-3/+7
| * | Refactor user associations. Drop support of Group#owner_idDmitriy Zaporozhets2013-11-051-13/+10
| |/
| * refactor by_username_or_idNihad Abbasov2013-10-161-5/+1
| * Enable confirmable and reconfirmable modules for UserDmitriy Zaporozhets2013-10-151-2/+2
| * Reverted accidently removed registration moduleDmitriy Zaporozhets2013-10-091-2/+2
| * Send devise emails asyncDmitriy Zaporozhets2013-10-091-2/+2
| * avatar upload on profile pageSteven Thonus2013-10-091-1/+8
| * Typo:Corrected the typo of sign-in in User ModelYatish Mehta2013-10-031-1/+1
* | getting user keys publically through http without any authentication, the git...devaroop2013-10-021-0/+4
|/
* Group ownership completely based on users_groups relation nowDmitriy Zaporozhets2013-09-261-1/+1
* Make users theme configurableIzaak Alpert2013-09-221-1/+1
* Fix setting default values for userDmitriy Zaporozhets2013-09-141-7/+10
* Removed private scopeIzaak Alpert2013-09-111-2/+0
* Style updatesIzaak Alpert2013-09-111-3/+6
* Update to only provide one way to get a default userIzaak Alpert2013-09-111-10/+17
* Update User api to respect default settingsIzaak Alpert2013-09-111-0/+5
* Fix several_namespaces? to work with multiple ownership of groupsStephen Holdaway2013-09-121-1/+1
* Some of the requested updates, rebase on masterIzaak Alpert2013-09-091-0/+8
* Refactor Gitlab::AuthDmitriy Zaporozhets2013-09-041-16/+0
* Mode User+LDAP functionality from Gitlab::AuthDmitriy Zaporozhets2013-09-021-0/+1
* Improve user block/removal from admin areaDmitriy Zaporozhets2013-08-271-1/+7
* Improve user block logicDmitriy Zaporozhets2013-08-271-0/+11
* ReannotateDmitriy Zaporozhets2013-08-211-3/+3
* Remove can_create_team code from userDmitriy Zaporozhets2013-08-211-2/+1
* Fix typosJohannes Schleifenbaum2013-07-291-1/+1
* Sanitize user attrs on model levelDmitriy Zaporozhets2013-07-101-0/+10
View Lorry Controller Status