summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Expand)AuthorAgeFilesLines
* fixed LDAP activation on login to use new ldap_blocked statefeature/ldap-sync-edgecasesGabriel Mazetto2016-01-141-0/+1
* Repair ldap_blocked state when no ldap identity exist anymoreGabriel Mazetto2016-01-081-0/+1
* Add ldap_blocked as new state to users state machineGabriel Mazetto2016-01-081-1/+11
* Annotate modelsStan Hu2016-01-061-56/+57
* Prevent duplicate "username has already been taken" validation messagers-issue-201Robert Speicher2016-01-021-1/+4
* Merge branch 'add_email_unlock' into 'master' Robert Speicher2015-12-211-0/+1
|\
| * Allow account unlock via emailDrew Blessing2015-12-141-0/+1
* | Fixed Rubocop offensesGabriel Mazetto2015-12-151-3/+3
|/
* Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-141-4/+3
|\
| * Remove ci_ prefix from all ci related thingsKamil Trzcinski2015-12-111-1/+1
| * Migrate CI::Project to ProjectKamil Trzcinski2015-12-111-3/+2
* | Refactor `TokenAuthenticatable` to improve reusabilityGrzegorz Bizon2015-12-111-1/+3
|/
* Update annotationsStan Hu2015-12-081-0/+1
* Add custom NamespaceValidatorRobert Speicher2015-12-071-4/+2
* fix deprecation messages in testsValery Sizov2015-12-031-1/+1
* git rid of deprecated warningsdeprecated_warningsValery Sizov2015-12-021-0/+5
* Merge pull request #9670 from janten/gravatar-retinaStan Hu2015-11-261-2/+2
|\
| * Fix merge errorJan-Gerd Tenberge2015-10-221-17/+30
| |\
| * | Add scale argument in user classJan-Gerd Tenberge2015-09-261-2/+2
* | | Use "GitLab.com" instead of "gitlab.com"atom-feed-latest-updateYorick Peterse2015-11-181-1/+1
* | | Don't pluck project IDs in User#owned_projectsYorick Peterse2015-11-181-4/+2
* | | Apply CI scope changes to the User modelYorick Peterse2015-11-181-6/+10
* | | Refactor User#authorized_groups/projectsYorick Peterse2015-11-181-29/+6
* | | Refactor getting user groups/projects/contributionsYorick Peterse2015-11-181-16/+48
* | | Prefix table names for User UNIONsYorick Peterse2015-11-181-2/+3
* | | Use SQL::Union for User#authorized_groupsYorick Peterse2015-11-181-4/+7
* | | Use SQL::Union for User#authorized_projectsYorick Peterse2015-11-181-21/+19
* | | Show specific runners from projects where user is master or ownerci-runners-master-or-ownerKamil Trzcinski2015-11-161-5/+10
* | | Annotate modelsDmitriy Zaporozhets2015-11-131-0/+1
* | | Use a subquery with IDs only for find_by_any_emailYorick Peterse2015-10-301-9/+7
* | | Fixed UNION syntax for MySQLYorick Peterse2015-10-301-2/+2
* | | Use a UNION for User.find_by_any_emailYorick Peterse2015-10-301-3/+12
* | | Improve performance of User.find_by_any_emailYorick Peterse2015-10-301-15/+3
* | | Fix specific runner visibilityKamil Trzcinski2015-10-261-9/+14
| |/ |/|
* | Merge branch 'cristianbica/gitlab-ce-user-project-view-files' into 'master' Dmitriy Zaporozhets2015-10-191-1/+1
|\ \
| * \ Merge branch 'master' into cristianbica/gitlab-ce-user-project-view-filesDouwe Maan2015-10-171-9/+19
| |\ \
| * | | Allow users to select the Files view as default project viewCristian Bica2015-10-011-1/+1
* | | | Fix nonatomic database update potentially causing project star counts to go n...Stan Hu2015-10-171-6/+9
| |/ / |/| |
* | | Improve performance of User.by_loginuser-by-login-performanceYorick Peterse2015-10-151-2/+8
* | | Merge branch 'user-preferences-layout-option' of https://github.com/gopeter/g...Dmitriy Zaporozhets2015-10-051-0/+4
|\ \ \
| * | | improved code style and layout option namingPeter Göbel2015-10-051-1/+1
| * | | added user preference to change layout widthPeter Göbel2015-10-051-0/+4
* | | | Add user to Ci::Build to have pusher email addressKamil Trzcinski2015-10-051-0/+1
|/ / /
* | | Merge remote-tracking branch 'upstream/master'Guilherme Garnier2015-10-031-0/+4
|\ \ \
| * \ \ Merge branch 'rs-throttle-reset' into 'master' Douwe Maan2015-10-021-0/+4
| |\ \ \
| | * | | Add User#recently_sent_password_reset?Robert Speicher2015-10-011-0/+4
| | |/ /
* | | | Fix rubocop warnings in appGuilherme Garnier2015-10-031-7/+1
|/ / /
* | | Streamline the "Report button"rymai/gitlab-ce-disable-report-button-if-already-reportedRémy Coutable2015-09-291-2/+1
* | | Disable the "Report abuse" button if a user has already been reportedRémy Coutable2015-09-291-0/+2
|/ /
* | Add user preference to view project activity and starred project activity as ...Stan Hu2015-09-261-1/+1
|/
View Lorry Controller Status