summaryrefslogtreecommitdiff
path: root/app/models/user.rb
Commit message (Collapse)AuthorAgeFilesLines
* Allow primary email to be set to an email that you've already added.change-primary-emailDouwe Maan2015-04-301-2/+26
|
* Allow user to choose which email to be publicSenorsen2015-04-141-0/+9
| | | | | This commit allows user to show one of their emails in profile page, or don't show email in this page.
* 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. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1774. Project settings: ![Screen_Shot_2015-03-27_at_14.46.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/01799ff912671ba6db3f828ea1aca1a6/Screen_Shot_2015-03-27_at_14.46.48.png) The "Public deploy keys" section is only shown when there are any. If there are public deploy keys but no project deploy keys, only public deploy keys are shown. If there are no public deploy keys and no project deploy keys, the current "Deploy keys from projects you have access to will be displayed here" placeholder is shown. The list of projects below the public key has been changed to only show projects the user has access to. "Public deploy key" seems to be repeated on the left, but the first is just the title. The label is always visible for public deploy keys. Admin index: ![Screen_Shot_2015-03-27_at_14.47.06](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ea889d274cfd3f0694d47d602f4f3e94/Screen_Shot_2015-03-27_at_14.47.06.png) Admin detail page: ![Screen_Shot_2015-03-27_at_14.47.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8c8475e05bf6b497da3b9f1bc102329f/Screen_Shot_2015-03-27_at_14.47.16.png) Projects using the deploy key are listed on the left and can be disabled easily. See merge request !469
| * 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
|\ | | | | | | | | | | | | | | | | | | Generalizes image upload in drag and drop in markdown to all files From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/265 by Hannes Rosenögger. - [x] Rebase on master when !1553 is merged in See merge request !1530
| * Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-251-3/+4
| |\ | | | | | | | | | | | | # Conflicts: # app/controllers/files_controller.rb
| * \ Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-241-0/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/issues/_form.html.haml # app/views/projects/merge_requests/_form.html.haml # app/views/projects/merge_requests/_new_submit.html.haml # app/views/projects/milestones/_form.html.haml # app/views/projects/notes/_form.html.haml # app/views/projects/wikis/_form.html.haml # config/routes.rb # spec/controllers/projects_controller_spec.rb
| * \ \ Merge branch 'extend_markdown_upload' into generic-uploadsDouwe Maan2015-02-201-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/files_controller.rb # app/controllers/projects/uploads_controller.rb # app/uploaders/attachment_uploader.rb
| * | | | Split up AttachmentUploader.Douwe Maan2015-02-201-1/+1
| | | | |
* | | | | Merge branch 'bitbucket-import'Dmitriy Zaporozhets2015-02-251-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | Conflicts: app/views/import/gitorious/status.html.haml db/schema.rb
| * | | | Add Bitbucket importer.Douwe Maan2015-02-241-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'contributed-projects' into 'master'Dmitriy Zaporozhets2015-02-241-3/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Improve contributed project and commit calendar selection. Fixes #2024. See merge request !1554
| * | | 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. See #2014. Note that the projects limit still isn't retroactively applied to existing users (probably as intended) See merge request !1547
| * | 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
|/ / | | | | | | This reverts commit 7d5f86f6cbd187e75a6ba164ad6bfd036977dd07.
* | 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
| | | | | | | | | | | This commit moves the note folder from /public/uploads/note to /uploads/note and changes the uploader accordingly. Now it's no longer possible to avoid the access control by modifing the url. The Avatar upload has been refactored to use an own uploader as well to cleanly seperate the two upload types.
* 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. See #1985 cc @sytse See merge request !1517
| * 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 Git over HTTP(S) See #1982. ![Screen Shot 2015-02-13 at 13.37.28](https://dev.gitlab.org/uploads/gitlab/gitlabhq/69fe527252/Screen_Shot_2015-02-13_at_13.37.28.png) There's a similar tooltip for SSH: "Add an SSH key to your profile to pull or push via SSH". These are always shown on-hover, even if the persistent flash above was hidden. cc @sytse See merge request !1512
| * | Allow users that signed up via OAuth to set their password in order to use ↵Douwe Maan2015-02-131-0/+2
| |/ | | | | | | Git over HTTP(S).
* | 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
| | | | Fixes #1967.
* Merge branch 'notification_email'Dmitriy Zaporozhets2015-02-071-0/+18
|\ | | | | | | | | Conflicts: db/schema.rb
| * Allow notification email to be set separately from primary email.Douwe Maan2015-02-071-0/+18
| | | | | | | | Closes #1932.
* | 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 arrays [failure unrelated]
| * Append in place for strings and arraysCiro Santilli2015-01-011-2/+2
| |
* | Remove unnecessary / from avatar urlHannes Rosenögger2015-01-191-1/+1
| | | | | | | | | | So http://localhost:3000//uploads/user/avatar/1/avatar.png becomes http://localhost:3000/uploads/user/avatar/1/avatar.png
* | Merge pull request #8096 from cirosantilli/regex-to-stringDmitriy Zaporozhets2015-01-151-1/+1
|\ \ | | | | | | Replace regex methods by string ones since faster and more readable
| * | Replace regex methods by string ones since fasterCiro Santilli2014-12-281-1/+1
| |/ | | | | | | and more readable.
* | Improve application settings and write testsDmitriy Zaporozhets2015-01-081-2/+3
|/
* Rework oauth2 featureDmitriy Zaporozhets2014-12-251-0/+4
| | | | | | | | * improve UI * add authorization * add separate page for oauth applications Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status