summaryrefslogtreecommitdiff
path: root/app/controllers/admin
Commit message (Expand)AuthorAgeFilesLines
* Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-011-1/+0
* Merge remote-tracking branch 'upstream/master' into enable-shared-runners-wit...Lin Jen-Shin2016-07-012-0/+60
|\
| * Catch permission denied errors and ignore the diskimprove-system-infoJosh Frye2016-06-301-11/+38
| * Merge branch 'issue-18886' into 'master' Dmitriy Zaporozhets2016-06-301-3/+22
| |\
| | * Loop all disks when displaying system infoissue-18886Josh Frye2016-06-291-3/+22
| * | Add Application Setting to configure default Repository Path for new projectsshards-configAlejandro Rodríguez2016-06-291-0/+1
| |/
| * Change load average to cpu/cores on system info.Josh Frye2016-06-281-1/+2
| * Use number_to_human_size for system info and remove dependency on Filesize gem.Josh Frye2016-06-281-4/+4
| * Round figures for system infoJosh Frye2016-06-281-4/+4
| * Show basic system info on admin panel. Closes #18886Josh Frye2016-06-281-0/+12
* | Allow admins to assign locked runners:Lin Jen-Shin2016-06-281-2/+0
* | Admin should be able to turn shared runners into specific ones:Lin Jen-Shin2016-06-281-1/+1
|/
* Merge branch 'dz-fix-appearance-preview' into 'master' Jacob Schatz2016-06-211-0/+1
|\
| * Fix admin appearance settings previewdz-fix-appearance-previewDmitriy Zaporozhets2016-06-201-0/+1
* | Admin::RunnerProjectsController#index is not usedremove-admin-runner-projectsLin Jen-Shin2016-06-171-5/+0
* | Fix typo. It's ivar and the column was called lockedLin Jen-Shin2016-06-161-1/+1
* | Return the association and check it in controller instead:Lin Jen-Shin2016-06-141-1/+3
* | Avoid enabling locked runners. Give 403 in this caseLin Jen-Shin2016-06-141-0/+2
|/
* Allow custom text on 'almost there' pageSean McGivern2016-06-081-0/+1
* Add Application Setting to configure Container Registry token expire delay (d...Kamil Trzcinski2016-05-311-0/+1
* Minor runner-related code refactoringsGrzegorz Bizon2016-05-191-9/+10
* Display validation errors when admin edits a runnerGrzegorz Bizon2016-05-191-10/+16
* Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'Dmitriy Zaporozhets2016-05-185-5/+5
|\
| * Change deprecated usage of rendering without response bodyMehmet Emin İNAÇ2016-03-165-5/+5
* | Merge branch 'issue_14684' into 'master' Douwe Maan2016-05-161-0/+1
|\ \
| * | Change skip_user_confirmation_email to send_user_confirmation_emailFelipe Artur2016-05-161-1/+1
| * | Toggle email signup confirmation in admin settingsFelipe Artur2016-05-161-0/+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
|/ /
* | Merge branch 'health-check-route'Douwe Maan2016-05-122-0/+11
|\ \
| * | Add Changelog entryhealth-check-routeDJ Mountney2016-05-121-5/+1
| * | Add health_check access token, and enforce on the health_check endpointDJ Mountney2016-05-102-0/+15
* | | Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources'Douwe Maan2016-05-121-1/+8
|\ \ \
| * | | delete the enabled_oauth_sign_in_sources after getting it's value into enable...Andrei Gliga2016-05-121-3/+1
| * | | Array(enabled_oauth_sign_in_sources) instead of the ifAndrei Gliga2016-05-121-1/+1
| * | | enabled_oauth_sign_in_sources param doesn't need permitAndrei Gliga2016-05-121-1/+0
| * | | On Application Settings Page let the user select the enabled OAuth Sign in so...Andrei Gliga2016-05-121-8/+8
| * | | disabled_oauth_sign_in_sources parameter handling in ApplicationSettingsContr...Andrei Gliga2016-05-121-1/+11
| |/ /
* | | Share form editable attributes mf runner via modelGrzegorz Bizon2016-05-101-1/+1
|/ /
* | Log to application.log when an admin starts and stops impersonating a userStan Hu2016-05-042-0/+4
* | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-05-024-45/+41
|\ \
| * | Store original user in variableDouwe Maan2016-04-221-2/+2
| * | Remove unused methodDouwe Maan2016-04-221-4/+0
| * | Fix issue with impersonationDouwe Maan2016-04-224-45/+45
* | | Added UI to define secret_token for webhook and systemhookfeature/backport-safewebhooksGabriel Mazetto2016-05-021-1/+7
|/ /
* | Configuring of points per UDP packettoggle-points-per-packetYorick Peterse2016-04-191-0/+1
* | Merge branch 'configurable-shared-runners-text' into 'master' Kamil Trzciński2016-04-191-0/+1
|\ \
| * | Add configurable shared runners textKamil Trzcinski2016-04-181-0/+1
* | | Add push events to permit params in system hooksdz/system-hooks-uiDmitriy Zaporozhets2016-04-191-1/+1
|/ /
* | Clear repository check columns asynchronouslyJacob Vosmaer2016-04-132-7/+3
* | BastaJacob Vosmaer2016-04-122-2/+2
View Lorry Controller Status