summaryrefslogtreecommitdiff
path: root/app/controllers/admin/users_controller.rb
Commit message (Expand)AuthorAgeFilesLines
* Refactor authorized params in Admin::UsersControllerrefactor-admin-controllers-paramsRémy Coutable2017-01-111-9/+32
* Merged the 'groups' and 'projects' tabs when viewing user profilesJames Gregory2016-12-291-3/+0
* Allow to search for user by secondary email address in the admin interfaceYar2016-11-011-1/+1
* Rename :name search parameter to :search_query at /admin/usersYar2016-11-011-1/+1
* Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'Dmitriy Zaporozhets2016-05-181-1/+1
|\
| * Change deprecated usage of rendering without response bodyMehmet Emin İNAÇ2016-03-161-1/+1
* | Force password change after admin reset13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-loginSean McGivern2016-05-161-0/+1
* | Log to application.log when an admin starts and stops impersonating a userStan Hu2016-05-041-0/+2
* | Fix issue with impersonationDouwe Maan2016-04-221-0/+16
* | Merge branch '4009-external-users' into 'master' Douwe Maan2016-03-171-1/+1
|\ \
| * | External UsersZeger-Jan van de Weg2016-03-131-1/+1
| |/
* | Add ability to delete a user with forceZeger-Jan van de Weg2016-03-151-1/+1
* | A worker deletes a user, so the request doesn't time outZeger-Jan van de Weg2016-03-151-1/+1
|/
* Prevent ldap_blocked users from being unblocked by the Admin UIGabriel Mazetto2016-01-081-1/+3
* refactor login as to be impersonation with better login/logoutJames Newton2015-10-291-6/+0
* Redirect to a default path if HTTP_REFERER is not setStan Hu2015-10-201-9/+17
* Add option to admin area to sign in as a specific userPavel Forkert2015-09-241-0/+6
* Devise 3.5.x deprecates `confirm!` in favor of `confirm`Robert Speicher2015-09-191-1/+1
* Add "Confirm user" button in user admin pageStan Hu2015-08-051-0/+8
* Add disable_two_factor route for Admin::UsersRobert Speicher2015-07-101-0/+6
* Add support for unlocking users in admin settingsStan Hu2015-07-021-0/+8
* Merge branch 'admin-edit-identities' into 'master'Dmitriy Zaporozhets2015-06-231-1/+10
|\
| * Refactor admin user pageDmitriy Zaporozhets2015-06-221-1/+10
* | Fix error when deleting a user who has projectsStan Hu2015-06-231-1/+1
|/
* You can not remove user if he/she is an only owner of groupDmitriy Zaporozhets2015-05-281-5/+1
* Allow primary email to be set to an email that you've already added.change-primary-emailDouwe Maan2015-04-301-2/+1
* Fixed the Rails/ActionFilter copJeroen van Baarsen2015-04-201-1/+1
* Skip email confirmation when set by admin or via LDAP.skip-email-reconfirmationDouwe Maan2015-04-061-1/+1
* Improve user block/unblock UI in admin areaDmitriy Zaporozhets2015-03-091-2/+2
* Allow users that signed up via OAuth to set their password in order to use Gi...Douwe Maan2015-02-131-1/+1
* Merge branch 'notification_email'Dmitriy Zaporozhets2015-02-071-0/+3
|\
| * Allow notification email to be set separately from primary email.Douwe Maan2015-02-071-0/+3
* | Refactor sorting in projectDmitriy Zaporozhets2015-02-051-2/+2
* | Explicitly define ordering in models using default_scopeDmitriy Zaporozhets2015-02-051-2/+2
|/
* Share the key table between admin and profile resources.Marin Jankovski2014-12-301-1/+1
* Move user key manipulation in admin section to a separate controller.Marin Jankovski2014-12-301-21/+0
* Add user key actions to admins.Marin Jankovski2014-12-291-1/+23
* Admin: user sortingValery Sizov2014-10-131-0/+1
* Merge branch 'new_user_password_set' into 'master'Dmitriy Zaporozhets2014-07-231-1/+2
|\
| * Do not set password expiry.Marin Jankovski2014-07-151-1/+1
| * Do not sent a generated password via email for admin created user.Marin Jankovski2014-07-151-0/+1
* | Fix user params when edit from admin areaDmitriy Zaporozhets2014-07-161-2/+4
|/
* Make app works with strong paramsDmitriy Zaporozhets2014-06-261-17/+10
* User model to strong params. Comment other attr_accessible to let tests runDmitriy Zaporozhets2014-06-261-7/+16
* Add option for admin to remove users secondary emails.Marin Jankovski2014-06-231-0/+10
* Restyle admin/user pageDmitriy Zaporozhets2014-06-031-1/+2
* Fix 500 error when try to update own profile in admin areaDmitriy Zaporozhets2014-02-251-1/+3
* Remove deprecated findersskv2014-01-191-1/+1
* Add User#email uniq validation. Fixed confirmation for admin/users formDmitriy Zaporozhets2013-12-261-1/+1
* fix most of warningsskv2013-12-151-2/+1