summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-031-1/+23
|\
| * Flush cache in callback. Add testsJosh Frye2016-06-021-4/+9
| * Cache assigned open issue count. Closes #18035Josh Frye2016-06-021-2/+8
| * Cache assigned merge request count. Closes #18036Josh Frye2016-06-021-0/+6
| * Upgrade attr_encrypted and encryptorConnor Shea2016-05-301-0/+5
| * Upgrade devise and devise-two-factor, remove devise-asyncConnor Shea2016-05-301-1/+1
* | Merge branch 'master' into awardablesZJ van de Weg2016-05-251-9/+0
|\ \ | |/
| * Revert "Merge branch 'issues/15127' into 'master'"revert-3656b5dbStan Hu2016-05-191-0/+5
| * Merge branch 'issues/15127' into 'master' Stan Hu2016-05-191-5/+0
| |\
| | * fix #15127 ActiveJob::DeserializationError thrownP.S.V.R2016-04-111-5/+0
| * | Remove User#tm_in_authorized_projects and User#tm_ofRémy Coutable2016-05-181-9/+0
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-181-0/+5
|\ \ \ | |/ /
| * | Fix changelog fileFelipe Artur2016-05-161-1/+0
| * | Change skip_user_confirmation_email to send_user_confirmation_emailFelipe Artur2016-05-161-1/+2
| * | Toggle email signup confirmation in admin settingsFelipe Artur2016-05-161-0/+5
* | | Incorporate feedbackZeger-Jan van de Weg2016-05-111-1/+1
* | | Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-111-0/+5
|\ \ \ | |/ /
| * | Tidy up user project specsSean McGivern2016-05-111-1/+1
| * | Restrict starred projects to viewable onesSean McGivern2016-05-101-0/+5
* | | Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-111-66/+1
|\ \ \ | |/ /
| * | Remove the annotate gem and delete old annotationsJeroen van Baarsen2016-05-091-65/+0
| * | Merge branch 'fix-secret' into 'master' Rémy Coutable2016-05-091-1/+1
| |\ \
| | * | Don't read otp_secret_encryption_key from hardcoded path in models/userJakub Jirutka2016-05-041-1/+1
| * | | Annotate the modelsZeger-Jan van de Weg2016-05-061-24/+25
| |/ /
| * | Revert "Remove the Devise Async gem."Connor Shea2016-05-031-1/+1
| * | Remove the Devise Async gem.Connor Shea2016-04-261-1/+1
| * | Remove useless require 'file_size_validator' causing warningsRémy Coutable2016-04-191-1/+0
* | | Create table for award emojiZeger-Jan van de Weg2016-05-061-0/+1
|/ /
* | 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
|\