summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Expand)AuthorAgeFilesLines
* Select namespace where to fork projectDmitriy Zaporozhets2014-11-131-0/+10
* Merge pull request #7967 from Bugagazavr/issue-actorValeriy Sizov2014-11-051-0/+8
|\
| * Add issueable actorKirill Zaitsev2014-10-051-0/+8
* | Session API: Use case-insensitive authentication like in UIAndrey Krivko2014-10-301-0/+5
* | Factor abilities methodsCiro Santilli2014-10-191-5/+1
* | Merge remote-tracking branch 'origin/master' into feature-multiple-ldap-serversJan-Willem van der Meer2014-10-131-0/+10
|\ \
| * | Admin: user sortingValery Sizov2014-10-131-0/+10
| |/
* | Add refactoring for multiple LDAP server supportJan-Willem van der Meer2014-10-131-3/+2
|/
* Add parenthesis to function def with arguments.Ciro Santilli2014-10-031-7/+7
* Fix adminarea and emails for new membership logicDmitriy Zaporozhets2014-09-151-1/+1
* Fix migration and association for new members tableDmitriy Zaporozhets2014-09-141-3/+3
* Replace old references of users_project & users_groupDmitriy Zaporozhets2014-09-141-3/+3
* Huge replace of old users_project and users_group referencesDmitriy Zaporozhets2014-09-141-7/+9
* Refactor Oauth::User class to use instance methodsJan-Willem van der Meer2014-09-031-4/+0
* Merge branch 'ldap/cache_check' into 'master'Dmitriy Zaporozhets2014-08-131-1/+3
|\
| * Skip LDAP cache check when LDAP is disabledJacob Vosmaer2014-08-061-1/+3
* | Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosant...Dmitriy Zaporozhets2014-07-241-0/+16
|\ \
| * | Add star count, view logic, more tests.Ciro Santilli2014-07-171-1/+2
| * | Add project stars.Ciro Santilli2014-07-171-0/+15
* | | Merge branch 'new_user_password_set' into 'master'Dmitriy Zaporozhets2014-07-231-1/+10
|\ \ \ | |_|/ |/| |
| * | Use a better name for token.Marin Jankovski2014-07-161-3/+3
| * | Do not sent a generated password via email for admin created user.Marin Jankovski2014-07-151-1/+10
| |/
* | Merge branch 'fix/avatar_relative_url' into 'master'Dmitriy Zaporozhets2014-07-211-1/+1
|\ \ | |/ |/|
| * Don't use URI joinDrew Blessing2014-07-071-1/+1
* | Try to keep token authenticable compatibilityMarin Jankovski2014-07-091-1/+2
|/
* Merge pull request #7204 from cirosantilli/user-validation-msgDmitriy Zaporozhets2014-07-021-1/+1
|\
| * Fix username validation message to match regexp.Ciro Santilli2014-06-261-1/+1
* | Make app works with strong paramsDmitriy Zaporozhets2014-06-261-17/+10
* | User model to strong params. Comment other attr_accessible to let tests runDmitriy Zaporozhets2014-06-261-12/+0
|/
* Fix namespace selector on Projects#new pageDmitriy Zaporozhets2014-06-241-1/+1
* Fix user notificationsDmitriy Zaporozhets2014-06-171-2/+2
* Remove user observerDmitriy Zaporozhets2014-06-171-0/+36
* Fix gravatar size and update docs for new users APIDmitriy Zaporozhets2014-06-131-1/+1
* Dont expose user email via APIDmitriy Zaporozhets2014-06-131-0/+8
* Fix tests for user pageDmitriy Zaporozhets2014-06-021-0/+4
* Add ability rule for creating project in namespaceDmitriy Zaporozhets2014-05-281-0/+2
* Re-annotate modelsDmitriy Zaporozhets2014-04-091-41/+42
* Add values to default fields to prevent 500 error when migrate from MySQL to ...Dmitriy Zaporozhets2014-04-091-0/+5
* Avoid false validation when create userDmitriy Zaporozhets2014-04-071-1/+1
* Allow oauth signup without emailDmitriy Zaporozhets2014-04-071-0/+8
* Change the user search query to be case insensitive.Marin Jankovski2014-03-261-1/+1
* Merge pull request #6457 from lol768/patch-1Sytse Sijbrandij2014-03-191-1/+1
|\
| * Fix registration error info typolol7682014-03-021-1/+1
* | Add User#requires_ldap_check? methodDmitriy Zaporozhets2014-03-111-2/+12
|/
* 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
View Lorry Controller Status