summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Fix user page performance and authorizationDmitriy Zaporozhets2015-02-181-2/+9
|/
* Fix broken access control and refactor avatar uploadHannes Rosenögger2015-02-161-1/+1
* Merge branch 'user-account-created-email' into 'master'Dmitriy Zaporozhets2015-02-161-1/+1
|\
| * Only send "Account was created for you" email when created by admin.Douwe Maan2015-02-131-1/+1
* | Merge branch 'oauth-password-http' into 'master'Dmitriy Zaporozhets2015-02-131-0/+2
|\ \
| * | Allow users that signed up via OAuth to set their password in order to use Gi...Douwe Maan2015-02-131-0/+2
| |/
* | Prevent autogenerated OAuth username to clash with existing namespace.Douwe Maan2015-02-131-2/+3
|/
* Clean username acquired from OAuth/LDAP.Douwe Maan2015-02-121-0/+16
* Merge branch 'notification_email'Dmitriy Zaporozhets2015-02-071-0/+18
|\
| * Allow notification email to be set separately from primary email.Douwe Maan2015-02-071-0/+18
* | Refactor sorting in projectDmitriy Zaporozhets2015-02-051-5/+4
* | Explicitly define ordering in models using default_scopeDmitriy Zaporozhets2015-02-051-3/+3
|/
* Rubocop: Style/AlignHash enabledDmitriy Zaporozhets2015-02-021-4/+6
* Rubocop enabled for: Use spaces inside hash literal bracesDmitriy Zaporozhets2015-02-021-2/+2
* Annotate modelsDmitriy Zaporozhets2015-01-221-3/+2
* Merge pull request #7999 from cirosantilli/append-inplaceDmitriy Zaporozhets2015-01-211-2/+2
|\
| * Append in place for strings and arraysCiro Santilli2015-01-011-2/+2
* | Remove unnecessary / from avatar urlHannes Rosenögger2015-01-191-1/+1
* | Merge pull request #8096 from cirosantilli/regex-to-stringDmitriy Zaporozhets2015-01-151-1/+1
|\ \
| * | Replace regex methods by string ones since fasterCiro Santilli2014-12-281-1/+1
| |/
* | Improve application settings and write testsDmitriy Zaporozhets2015-01-081-2/+3
|/
* Rework oauth2 featureDmitriy Zaporozhets2014-12-251-0/+4
* Doorkeeper integrationValery Sizov2014-12-241-0/+1
View Lorry Controller Status