summaryrefslogtreecommitdiff
path: root/app/controllers/admin
Commit message (Expand)AuthorAgeFilesLines
* Fix access token specsfix-specs-for-access-tokensSean McGivern2017-03-071-1/+1
* Merge branch 'siemens/gitlab-ce-feature/openid-connect'Sean McGivern2017-03-071-1/+1
|\
| * Make sure scopes are loaded in admin OAuth application formMarkus Koller2017-03-071-1/+1
* | Merge remote-tracking branch 'origin/personal_access_token_api_and_impersonat...Douwe Maan2017-03-071-0/+53
|\ \ | |/ |/|
| * apply codestyle and implementation changes to the respective feature codepersonal_access_token_api_and_impersonation_tokenTiago Botelho2017-03-061-11/+9
| * refactors finder and correlated codeTiago Botelho2017-03-011-7/+13
| * applies relevant changes to the code and code structureTiago Botelho2017-02-282-49/+49
| * refactors documentation and personal access tokens form to not allow admins t...Tiago Botelho2017-02-281-1/+2
| * add admin panel for personal access tokensSimon Vocella2017-02-281-0/+48
* | Add admin settings entriesPawel Chojnacki2017-03-061-0/+3
* | Merge branch 'dashboard-filter-search-keep-params' into 'master' Dmitriy Zaporozhets2017-03-041-0/+9
|\ \
| * | Refactor projects filtering by nameDmitriy Zaporozhets2017-03-031-0/+9
| |/
* | Bump health_check gem to version 2.6.0bump-health-check-gemDouglas Barbosa Alexandre2017-03-031-1/+1
|/
* Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifac...Lin Jen-Shin2017-02-241-2/+2
|\
| * Revert "Enable Style/DotPosition"Douwe Maan2017-02-231-3/+3
| * Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-231-3/+3
| * Prefer leading style for Style/DotPositionDouwe Maan2017-02-231-3/+3
| * Enable Style/MutableConstantDouwe Maan2017-02-231-2/+2
| * Enable Style/DotPositionDouwe Maan2017-02-231-3/+3
* | Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifac...Lin Jen-Shin2017-02-214-4/+5
|\ \ | |/
| * Merge branch 'fix_sidekiq_concurrency_warning_message_in_admin_background_job...Rémy Coutable2017-02-201-0/+1
| |\
| | * fix incorrect sidekiq concurrency count in admin background pagewendy04022017-02-191-0/+1
| * | exclude rpc_pipefs from system disc infoBen Bodenmiller2017-02-181-0/+1
| |/
| * Merge branch 'use-update-runner-service' into 'master' Kamil Trzciński2017-02-171-3/+3
| |\
| | * Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-153-5/+5
| | |\
| | * \ Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-071-0/+2
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-043-3/+7
| | |\ \ \
| | * | | | Prefer service object over after_save hookLin Jen-Shin2017-01-211-3/+3
| * | | | | Drop theme ID from users tableAnnabel Dunstone Gray2017-02-151-1/+0
| | |_|_|/ | |/| | |
* | | | | Use the same syntax for default expirationLin Jen-Shin2017-02-151-1/+1
* | | | | Initial implementation for default artifacts expirationLin Jen-Shin2017-02-151-0/+1
|/ / / /
* | | | Merge branch 'dz-refactor-full-path' into 'master' Dmitriy Zaporozhets2017-02-082-3/+3
|\ \ \ \
| * | | | Store group and project full name and full path in routes tabledz-refactor-full-pathDmitriy Zaporozhets2017-02-082-3/+3
* | | | | Fix inconsistent naming for services that delete thingsdixpac2017-02-081-1/+1
|/ / / /
* | | | Merge branch 'ee-1439-read-only-user' into 'master' Douwe Maan2017-02-071-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Backport of the frontend view, including testsJose Ivan Vargas2017-02-061-1/+1
| | |/ | |/|
* | | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-061-0/+1
|\ \ \
| * | | Introduce maximum session time for terminal websocket connectionterminal-max-session-timeAdam Niedzielski2017-02-061-0/+1
| |/ /
* | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-032-2/+2
|\ \ \ | |/ /
| * | replace `find_with_namespace` with `find_by_full_path`Adam Pahlevi2017-02-032-2/+2
* | | Add GitLab PagesKamil Trzcinski2017-01-311-0/+1
|/ /
* | EE backport for new application settings serviceOswaldo Ferreira2017-01-231-1/+5
|/
* Add support for PlantUML diagrams in Asciidoc.Horacio Sanson2017-01-121-0/+2
* Refactor authorized params in Admin::UsersControllerrefactor-admin-controllers-paramsRémy Coutable2017-01-112-27/+32
* Refactor authorized params in Admin::GroupsControllerRémy Coutable2017-01-111-2/+6
* Refactor authorized params in Admin::ApplicationSettingsControllerRémy Coutable2017-01-111-45/+70
* Merged the 'groups' and 'projects' tabs when viewing user profilesJames Gregory2016-12-291-3/+0
* Fix: Admin group show page does not workfix-admin-group-pageValery Sizov2016-12-281-1/+1
* Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-271-2/+2
|\
| * Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-201-1/+4
| |\
View Lorry Controller Status