summaryrefslogtreecommitdiff
path: root/app/controllers/profiles
Commit message (Collapse)AuthorAgeFilesLines
* Restyle oauth accounts at profile page and add ability to unlink accountimprove-profileDmitriy Zaporozhets2015-03-211-0/+6
|
* Use `group_member` instead of `users_group` or `membership`.Douwe Maan2015-03-151-3/+3
|
* Move profile groups page to dashboardDmitriy Zaporozhets2015-03-081-23/+0
|
* Allow users that signed up via OAuth to set their password in order to use ↵Douwe Maan2015-02-131-3/+5
| | | | Git over HTTP(S).
* Merge branch 'notification_email'Dmitriy Zaporozhets2015-02-072-2/+23
|\ | | | | | | | | Conflicts: db/schema.rb
| * Allow notification email to be set separately from primary email.Douwe Maan2015-02-072-2/+23
| | | | | | | | Closes #1932.
* | Explicitly define ordering in models using default_scopeDmitriy Zaporozhets2015-02-051-1/+1
|/
* Fix adminarea and emails for new membership logicDmitriy Zaporozhets2014-09-151-3/+3
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Replace old references of users_project & users_groupDmitriy Zaporozhets2014-09-141-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Huge replace of old users_project and users_group referencesDmitriy Zaporozhets2014-09-142-6/+6
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Require current password even if password was expiredDmitriy Zaporozhets2014-07-291-0/+5
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix password change. Fix test settingsDmitriy Zaporozhets2014-06-261-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Make app works with strong paramsDmitriy Zaporozhets2014-06-261-1/+7
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Key strong paramsDmitriy Zaporozhets2014-06-261-1/+6
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* User model to strong params. Comment other attr_accessible to let tests runDmitriy Zaporozhets2014-06-261-4/+8
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Allow oauth signup without emailDmitriy Zaporozhets2014-04-071-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix `/:username.keys` response content typeDmitry Medvinsky2014-03-201-1/+1
| | | | | | | | | Currently this method responds with `text/html`. It is kind of unusable if you open it in a browser. The browser thinks it is HTML and renders it as HTML, meaning new lines are dropped. So it's very hard to distinguish where the key starts and where it ends. This commit changes the content type header to `text/plain`.
* Add email aliases for usersJason Hollingsworth2014-02-131-0/+26
| | | | | | | | Emails are used to associate commits with users. The emails are not verified and don't have to be valid email addresses. They are assigned on a first come, first serve basis. Notifications are sent when an email is added.
* User can leave group from group page.Ciro Santillli2014-02-121-4/+3
|
* Split the user ssh keys by newline, not the characters "\n"Johannes Schleifenbaum2014-02-111-1/+1
| | | | | | | | | | | | | | before: GET /user.keys ssh-rsa ...\nssh-rsa ...\nssh-rsa ... after: GET /user.keys ssh-rsa ... ssh-rsa ... sha-rsa ...
* code refactor as per standardsGitLab2014-02-111-4/+7
|
* sync with upstream for ease to mergeGitLab2014-02-065-4/+63
|\
| * merge with upstream masterGitLab2014-02-065-4/+63
| |\
| | * Remove deprecated findersskv2014-01-191-1/+1
| | |
| | * fix most of warningsskv2013-12-151-1/+1
| | |
| | * Expire event cache on avatar creation/removalDrew Blessing2013-12-111-0/+2
| | |
| | * Issue 5716 - Allow removal of avatarDrew Blessing2013-12-021-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add class and style Add spinach tests Add entry to CHANGELOG Add entry to CHANGELOG
| | * Fix spinach profile testsDmitriy Zaporozhets2013-10-091-2/+2
| | |
| | * Move profile account to separate controllerDmitriy Zaporozhets2013-10-091-0/+7
| | |
| | * Separate page for password changeDmitriy Zaporozhets2013-10-091-1/+40
| | |
| * | getting user keys publically through http without any authentication, the ↵devaroop2013-10-021-0/+18
| |/ | | | | | | github way. E.g: http://github.com/devaroop.keys
* | adding tests for the ssh keys featureGitLab2014-02-061-1/+1
| |
* | getting user keys publically through http without any authentication, the ↵devaroop2013-10-031-0/+18
|/ | | | | | github way. E.g: http://github.com/devaroop.keys changelog updated to include ssh key retrieval feature update
* Group ownership completely based on users_groups relation nowDmitriy Zaporozhets2013-09-261-2/+2
| | | | | | | Before we have only owner_id to determine group owner With multiple owners per group we should get rid of owner_id in group. So from now @group.owner will always be nil but @group.owners return an actual array of users who can admin this group
* Show correct group membership in profileDmitriy Zaporozhets2013-08-061-1/+1
|
* Add group button at Profile#groups pageDmitriy Zaporozhets2013-07-121-1/+1
|
* Ability to leave group from profile areaDmitriy Zaporozhets2013-07-121-0/+24
|
* Better design for SSH keys pageDmitriy Zaporozhets2013-06-241-1/+1
|
* Move Profile related controllers under Profiles:: moduleDmitriy Zaporozhets2013-06-243-0/+99
View Lorry Controller Status