summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Expand)AuthorAgeFilesLines
* Add method to return the user notification setting for a group, or a projectDouglas Barbosa Alexandre2016-04-081-0/+4
* Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-081-0/+2
|\
| * Allow temp-oauth-email as notification emailerror-when-ldap-doesn-t-supply-an-email-address-14559Zeger-Jan van de Weg2016-03-311-0/+2
* | Remove useless Notification modelDmitriy Zaporozhets2016-03-301-4/+0
* | Update NotificationService to use NotificationSettings instead of membershipDmitriy Zaporozhets2016-03-301-0/+3
* | Introduce NotificationSetting to user interfaceDmitriy Zaporozhets2016-03-301-1/+6
|/
* Implementing 'Groups View' and 'TODOs View' as options for dashboard preferen...Elias Werberich2016-03-241-1/+1
* Merge branch 'master' into feature/issue-moveGrzegorz Bizon2016-03-191-0/+13
|\
| * Merge branch 'master' into 4009-external-users4009-external-usersZeger-Jan van de Weg2016-03-151-8/+0
| |\
| * \ Merge branch 'master' into 4009-external-usersZeger-Jan van de Weg2016-03-141-1/+2
| |\ \
| * | | Create an external users tab on Admin user listZeger-Jan van de Weg2016-03-131-2/+3
| * | | External UsersZeger-Jan van de Weg2016-03-131-0/+12
* | | | Add access-level filter support for projects selectGrzegorz Bizon2016-03-171-1/+1
| |_|/ |/| |
* | | Revert "Merge branch 'avatar-cropping' into 'master' "revert-avatar-croppingRémy Coutable2016-03-151-8/+0
| |/ |/|
* | Merge branch 'share-project-ce' into 'master' Dmitriy Zaporozhets2016-03-141-1/+2
|\ \ | |/ |/|
| * Add finders logic and tests for shared projects featureDmitriy Zaporozhets2016-03-111-1/+2
* | Removed User#project_relationsprojects-finder-ee-compatibleYorick Peterse2016-03-121-6/+3
* | Removed arel_table receiver from search methodsYorick Peterse2016-03-111-1/+1
* | Clean up ProjectsFinder for getting user projectsYorick Peterse2016-03-111-3/+6
* | Use ILIKE/LIKE for searching usersYorick Peterse2016-03-111-1/+15
|/
* Move method to UserJacob Vosmaer2016-03-101-0/+7
* Merge branch 'rs-avatar-validation' into 'master' Douwe Maan2016-03-011-1/+1
|\
| * Only validate avatar cropping values when avatar is present AND changedrs-avatar-validationRobert Speicher2016-02-291-1/+1
* | Merge branch 'rs-fix-user-namespace_uniq' into 'master' Douwe Maan2016-03-011-1/+2
|\ \ | |/
| * Properly check for a pre-existing error in `User#namespace_uniq`rs-fix-user-namespace_uniqRobert Speicher2016-02-291-1/+2
* | Reset `otp_grace_period_started_at` after disabling 2FARobert Speicher2016-02-291-5/+6
|/
* Add `:with_avatar` trait to User factoryRobert Speicher2016-02-241-1/+1
* Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-231-1/+1
|\
| * Rename Tasks to TodosDouglas Barbosa Alexandre2016-02-201-1/+1
| * Add task modelDouglas Barbosa Alexandre2016-02-201-1/+1
* | Minor changes on avatar cropping internalsJohann Pardanaud2016-02-181-3/+4
* | Improve avatar cropping internals, based on suggestions made by @rspeicher on...Johann Pardanaud2016-02-171-4/+2
* | Merge branch 'master' into avatar-croppingJohann Pardanaud2016-02-161-10/+6
|\ \ | |/
| * Re-add EmailValidator to avoid the repetition of format: { with: Devise.email...streamline-email-validationRémy Coutable2016-02-091-2/+2
| * Validate email addresses using Devise.email_regexpRémy Coutable2016-02-091-5/+2
* | Fix #7959: Fix avatar stretching by providing a cropping featureJohann Pardanaud2016-02-091-0/+10
|/
* Fix typo on User modelDouglas Barbosa Alexandre2016-02-021-1/+1
* Support Akismet spam checking for creation of issues via APIStan Hu2016-02-021-0/+1
* Allow LDAP users to change their email if it was not set by the LDAP serverDouwe Maan2016-01-191-1/+4
* 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
View Lorry Controller Status