summaryrefslogtreecommitdiff
path: root/app/controllers/admin
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-121-1/+1
|\ \
| * | Fixes #14638.PotHix2016-04-061-1/+1
* | | Move 'clear checks' button to applicatoin settingsJacob Vosmaer2016-04-122-12/+14
* | | Rename almost all the thingsJacob Vosmaer2016-04-061-9/+9
* | | Rebase repo check MRJacob Vosmaer2016-04-041-1/+23
|/ /
* | Remove "Congratulations!" tweet button on newly-created project.connorshea2016-03-311-1/+0
* | Merge branch 'master' into issue_12658Douwe Maan2016-03-213-7/+7
|\ \
| * | Use the configured Kaminari "per page" defaultrs-use-kaminari-defaultRobert Speicher2016-03-193-7/+7
* | | Add specs and add visibility level to admin groupsFelipe Artur2016-03-211-1/+1
* | | Fix some specsDouwe Maan2016-03-201-1/+0
* | | Merge branch 'master' into issue_12658Douwe Maan2016-03-202-3/+3
|\ \ \ | |/ /
| * | Merge branch '4009-external-users' into 'master' Douwe Maan2016-03-171-1/+1
| |\ \
| * | | Clearify who deletes the userZeger-Jan van de Weg2016-03-151-1/+1
| * | | Fix broken specsZeger-Jan van de Weg2016-03-151-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
| | |/ | |/|
* | | Merge 4009-external-users into issue_12658Felipe Artur2016-03-161-1/+1
|\ \ \ | | |/ | |/|
| * | External UsersZeger-Jan van de Weg2016-03-131-1/+1
| |/