summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'make-namespaces-api-available-to-all-users' into 'master'Dmitriy Zaporozhets2015-06-041-0/+6
|\
| * Make namespace API available to all usersStan Hu2015-05-281-0/+6
* | Merge pull request #9318 from jvanbaarsen/allow-special-chars-bioDmitriy Zaporozhets2015-05-291-1/+1
|\ \
| * | Allow special characters in users bioJeroen van Baarsen2015-05-281-1/+1
| |/
* | You can not remove user if he/she is an only owner of groupDmitriy Zaporozhets2015-05-281-0/+4
|/
* Add `reference_pattern` to Referable modelsRobert Speicher2015-05-261-0/+8
* Add `to_reference` for models that support referencesRobert Speicher2015-05-261-3/+13
* Merge branch 'fix-avatar-removal' into 'master'Hannes Rosenögger2015-05-121-2/+2
|\
| * Fix bug where avatar filenames were not actually deleted from the database du...Stan Hu2015-05-071-2/+2
* | Merge branch '2fa' into 'master'Dmitriy Zaporozhets2015-05-121-2/+13
|\ \
| * | Remove extra `devise` call that got added by accidentRobert Speicher2015-05-101-3/+0
| * | Remove unnecessary User#login accessor overrideRobert Speicher2015-05-091-5/+0
| * | Generate 10 2FA backup codes instead of the default of 5Robert Speicher2015-05-091-1/+1
| * | Fix 2FA backup code removalRobert Speicher2015-05-091-0/+3
| * | Re-annotate User modelRobert Speicher2015-05-091-0/+5
| * | Update User model for two-factor authRobert Speicher2015-05-091-2/+10
| * | Fix rubocop complainDmitriy Zaporozhets2015-05-091-1/+1
| * | Init 2 factor authentication for user modelDmitriy Zaporozhets2015-05-091-1/+4
| |/
* | Don't show duplicate deploy keys. Fixes #1516Maran2015-05-081-1/+1
|/
* Re-annotate modelsStan Hu2015-05-031-0/+1
* Merge branch 'change-primary-email' into 'master'Dmitriy Zaporozhets2015-05-031-2/+26
|\
| * Allow primary email to be set to an email that you've already added.change-primary-emailDouwe Maan2015-04-301-2/+26
* | Add application setting to restrict user signups to e-mail domainsStan Hu2015-05-021-0/+24
|/
* Allow user to choose which email to be publicSenorsen2015-04-141-0/+9
* Merge branch 'public-deploy-keys' into 'master'Dmitriy Zaporozhets2015-04-131-1/+9
|\
| * Allow admin to create public deploy keys that are accessible to any project.Douwe Maan2015-04-031-1/+9
* | Fix persistent XSS vulnerability around profile website URLs.Douwe Maan2015-04-101-2/+2
|/
* Use more specific regexes.Douwe Maan2015-03-271-2/+2
* Move User.cleanup_username to Namespace.cleanup_path.Douwe Maan2015-03-271-16/+0
* Clean up subscriptions when user is deleted.user-subscriptions-dependentDouwe Maan2015-03-241-0/+1
* Refactor contributions events and write tests for calendarDmitriy Zaporozhets2015-03-221-5/+2
* Use `project_member` instead of `team_member`.Douwe Maan2015-03-151-4/+1
* Blocking user does not remove him/her from project/groups but show blocked labelDmitriy Zaporozhets2015-03-091-19/+1
* Re-annotate modelsDmitriy Zaporozhets2015-03-041-45/+47
* Fix and test User#contributed_projects_ids.Douwe Maan2015-02-271-0/+1
* Merge branch 'extend_markdown_upload' into 'master'Dmitriy Zaporozhets2015-02-251-1/+1
|\
| * Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-251-3/+4
| |\
| * \ Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-241-0/+5
| |\ \
| * \ \ Merge branch 'extend_markdown_upload' into generic-uploadsDouwe Maan2015-02-201-1/+1
| |\ \ \
| * | | | Split up AttachmentUploader.Douwe Maan2015-02-201-1/+1
* | | | | Merge branch 'bitbucket-import'Dmitriy Zaporozhets2015-02-251-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add Bitbucket importer.Douwe Maan2015-02-241-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'contributed-projects' into 'master'Dmitriy Zaporozhets2015-02-241-3/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Contributed projects either have user pushes or created MRs.Douwe Maan2015-02-241-3/+4
| |/ /
* | | LDAP users don't need to set a password to Git over HTTP.Douwe Maan2015-02-231-0/+5
|/ /
* | Merge branch 'projects-limit-default' into 'master'Dmitriy Zaporozhets2015-02-191-2/+9
|\ \
| * | Correctly set default projects limit for new users.Douwe Maan2015-02-191-2/+9
* | | Revert "Fix broken access control and refactor avatar upload"Dmitriy Zaporozhets2015-02-191-1/+1
|/ /
* | Get contributed projects for last year onlyDmitriy Zaporozhets2015-02-181-0/+1
* | Get contributed projects only if push event existsDmitriy Zaporozhets2015-02-181-0/+1
View Lorry Controller Status