summaryrefslogtreecommitdiff
path: root/app/controllers/admin
Commit message (Expand)AuthorAgeFilesLines
* created services for keyshaseeb2017-09-151-3/+2
* 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-073-5/+5
|\
| * Removes default scope from sortable23079-remove-default-scope-in-sortableTiago Botelho2017-09-073-5/+5
* | Merge branch '35012-navigation-add-option-to-change-navigation-color-palette'...Sean McGivern2017-09-071-0/+1
|\ \
| * | Restore some changes from !9199Rubén Dávila2017-09-061-0/+1
* | | Remove the `pretty` parameter for `usage_data`rs-remove-usage-ping-prettyRobert Speicher2017-09-061-2/+1
|/ /
* | Merge branch 'tc-test-admin-log-links' into 'master'Dmitriy Zaporozhets2017-09-061-1/+8
|\ \ | |/ |/|
| * Put loggers in before_action for easier overriding in EEtc-test-admin-log-linksToon Claes2017-09-061-1/+8
* | Merge branch '28938-password-change-workflow-for-admins' into 'master'Sean McGivern2017-08-311-4/+11
|\ \ | |/ |/|
| * Changes the password change workflow for admins.28938-password-change-workflow-for-adminsTiago Botelho2017-08-311-4/+11
* | Refactor Admin::ProjectsFinder by extracting finders as private methodsMehdi Lahmam2017-08-241-3/+3
|/
* Refactor `Admin::LogsController#show`rs-fix-admin-logs-timeoutRobert Speicher2017-08-221-0/+9
* Cache Appearance instances in Redisappearances-caching-and-schemaYorick Peterse2017-08-101-1/+1
* Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-041-0/+7
* Merge branch 'bvl-add-all-settings-to-api' into 'master'Robert Speicher2017-07-271-78/+3
|\
| * Make the attribute list for application settings reusableBob Van Landuyt2017-07-271-78/+3
* | Use params#require instead params[] accessOswaldo Ferreira2017-07-271-1/+1
* | Backport gitlab-ee!2456Oswaldo Ferreira2017-07-271-1/+1
|/
* Merge branch '35453-pending-delete-projects-error-in-admin-dashboard-fix' int...Sean McGivern2017-07-261-1/+1
|\
| * Fixes 500 error caused by pending delete projects in admin dashboard35453-pending-delete-projects-error-in-admin-dashboard-fixTiago Botelho2017-07-251-1/+1
* | Merge branch 'backport-ee-2328' into 'master'Sean McGivern2017-07-251-2/+2
|\ \ | |/ |/|
| * Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/...Nick Thomas2017-07-211-2/+2
* | Decrease ABC threshold to 56.96Maxim Rydkin2017-07-241-12/+3
|/
* Wrong data type when testing webhooksAlexander Randa2017-07-202-15/+4
* Fixes needed when GitLab sign-in is not enabledRobin Bobbitt2017-07-131-1/+1
* Allow to enable the Performance Bar for a group from the admin areaRémy Coutable2017-07-061-0/+2
* Merge branch '32408-enable-disable-all-restricted-visibility-levels' into 'ma...Douwe Maan2017-07-051-0/+2
|\
| * Allow admin to disable all restricted visibility levels32408-enable-disable-all-restricted-visibility-levelsTiago Botelho2017-07-051-0/+2
* | Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-051-2/+2
|/
* 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
* Help landing page customizationsRobin Bobbitt2017-06-141-0/+2
* Merge branch '3191-deploy-keys-update' into 'master'Rémy Coutable2017-06-071-4/+20
|\
| * Implement ability to update deploy keysAlexander Randa2017-06-021-4/+20
* | Merge branch 'instrument-infra' into 'master'Grzegorz Bizon2017-06-071-0/+1
|\ \
| * | Prometheus settingsPawel Chojnacki2017-06-021-0/+1
| |/
* | 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-0712-14/+18
* | Limit non-administrators to adding 100 members at a time to groups and projectsNick Thomas2017-06-061-3/+4