summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Expand)AuthorAgeFilesLines
* Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-011-1/+0
* Enable Style/SpaceAfterComma Rubocop coprubocop/enable-space-after-copsGrzegorz Bizon2016-06-291-1/+1
* add missing attribute to attr_encrypted so it is fully backwards-compatibleJames Lopez2016-06-281-0/+1
* Fix an information disclosure when requesting access to a group containing pr...Rémy Coutable2016-06-241-2/+2
* Fix user creation with stronger minimum password requirements:qNathan Bush2016-06-231-1/+1
* Unify check branch name existPaco Guzman2016-06-201-2/+1
* Cache todo counters (pending/done)18034-cache-todo-counterPaco Guzman2016-06-171-0/+17
* Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-161-10/+17
|\
| * Add request access for groupsRémy Coutable2016-06-141-3/+2
| * Use Issue.visible_to_user in Notes.search to avoid query duplicationDouglas Barbosa Alexandre2016-06-131-13/+10
| * Project members with guest role can't access confidential issuesDouglas Barbosa Alexandre2016-06-131-7/+18
* | Implement @DouweM's feedback.Timothy Andrew2016-06-161-0/+5
* | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-141-8/+13
|\ \ | |/
| * Remove notification level fild from users, improve migrations and specsissue_3359_2Felipe Artur2016-06-101-3/+6
| * Remove notification level from user modelFelipe Artur2016-06-101-8/+10
* | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-091-11/+35
|\ \ | |/
| * Add a `U2fRegistrations` table/model.Timothy Andrew2016-06-061-11/+34
| * Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-031-1/+23
| |\
| * \ Merge branch 'master' into awardablesZJ van de Weg2016-05-251-9/+0
| |\ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-181-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
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-111-66/+1
| |\ \ \ \ \
| * | | | | | Create table for award emojiZeger-Jan van de Weg2016-05-061-0/+1
* | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-031-10/+33
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | 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
| | |_|_|_|/ | |/| | | |
| * | | | | 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
| | |_|_|_|/ | |/| | | |
| * | | | | 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
| | |_|_|/ | |/| | |
| * | | | Tidy up user project specsSean McGivern2016-05-111-1/+1
| * | | | Restrict starred projects to viewable onesSean McGivern2016-05-101-0/+5
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-05-111-66/+2
|\ \ \ \ | |/ / /
| * | | 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
* | | | Allow creating Personal Access Tokens through the website.Timothy Andrew2016-04-281-0/+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
| |/ |/|
* | 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
|\ \ | |/
View Lorry Controller Status