summaryrefslogtreecommitdiff
path: root/app/controllers/admin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'introduce-base-polling-interval' into 'master' Sean McGivern2017-04-031-0/+1
|\
| * Introduce "polling_interval_multiplier" as application settingAdam Niedzielski2017-04-031-0/+1
* | Fix a few N+1 queries identified by Bulletfix-nplusone-queriesStan Hu2017-04-021-0/+1
|/
* Handle parsing OpenBSD ps output properly to display sidekiqSebastian Reitenbach2017-03-311-1/+1
* Merge branch 'tc-cleanup-application-settings-spec' into 'master' Sean McGivern2017-03-301-9/+0
|\
| * Remove redundant code to convert restricted_levels to integersToon Claes2017-03-231-9/+0
* | Merge branch 'fix_rake_gitlab_check_sidekiq' into 'master' Rémy Coutable2017-03-291-1/+1
|\ \
| * | There might be ps utilities out there, that assume 80chars insteadSebastian Reitenbach2017-03-281-1/+1
* | | Labels support color names in backendDongqing Hu2017-03-291-4/+5
|/ /
* | 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
* 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
|\ \ \
View Lorry Controller Status