summaryrefslogtreecommitdiff
path: root/app/controllers/admin/users_controller.rb
Commit message (Expand)AuthorAgeFilesLines
* Enable frozen string in app/controllers/**/*.rbrepo-forks/gitlab-ce-frozen-string-app-controllergfyoung2018-09-181-0/+2
* Disable existing offenses for the CodeReuse copsYorick Peterse2018-09-111-0/+2
* Updates from `rubocop -a`Lin Jen-Shin2018-07-091-1/+1
* Bring changes from EELin Jen-Shin2018-06-251-2/+2
* [Rails5] Rename `sort` methods to `sort_by_attribute`blackst0ne2018-04-041-1/+1
* Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_e...Douwe Maan2017-10-051-3/+3
|\
| * refactor emails servicerefactor-servicesJames Lopez2017-09-281-1/+1
| * refactor users update serviceJames Lopez2017-09-281-2/+2
| * refactor services to match EE signatureJames Lopez2017-09-281-3/+3
* | fix calls to Emails::DestroyServiceBrett Walker2017-09-231-1/+1
|/
* Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-111-0/+1
* Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-...revert-f2421b2bRubén Dávila2017-09-081-1/+0
* Merge branch '23079-remove-default-scope-in-sortable' into 'master'Douwe Maan2017-09-071-1/+1
|\
| * Removes default scope from sortable23079-remove-default-scope-in-sortableTiago Botelho2017-09-071-1/+1
* | Restore some changes from !9199Rubén Dávila2017-09-061-0/+1
|/
* Changes the password change workflow for admins.28938-password-change-workflow-for-adminsTiago Botelho2017-08-311-4/+11
* fix spec failuresJames Lopez2017-06-231-1/+1
* update code based on feedbackJames Lopez2017-06-231-4/+2
* refactor update user service not to do auth checksJames Lopez2017-06-231-2/+2
* fix specsJames Lopez2017-06-231-3/+3
* add missing action to blockJames Lopez2017-06-231-3/+3
* more refactoring based on feedbackJames Lopez2017-06-231-2/+2
* refactor emails serviceJames Lopez2017-06-231-6/+2
* update to use emails destroy serviceJames Lopez2017-06-231-1/+1
* fix api and controller issuesJames Lopez2017-06-231-2/+2
* fix specsJames Lopez2017-06-231-7/+8
* finish off refactoring users controllerJames Lopez2017-06-231-10/+25
* update users controllerJames Lopez2017-06-231-2/+5
* Add a rubocop rule to check if a method 'redirect_to' is used without explici...31840-add-a-rubocop-that-forbids-redirect_to-inside-a-controller-destroy-action-without-an-explicit-statusblackst0ne2017-06-071-1/+1
* Support hard deletion in Admin::UsersController#destroyNick Thomas2017-06-051-1/+1
* Implement new service for creating userGeorge Andrinopoulos2017-03-271-8/+4
* get the logic right :Xhttp://jneen.net/2017-03-091-1/+1
* consolidate the error handling for #impersonatehttp://jneen.net/2017-03-091-9/+12
* protect internal users from impersonationhttp://jneen.net/2017-03-091-0/+4
* Drop theme ID from users tableAnnabel Dunstone Gray2017-02-151-1/+0
* Backport of the frontend view, including testsJose Ivan Vargas2017-02-061-1/+1
* 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
View Lorry Controller Status