summaryrefslogtreecommitdiff
path: root/app/controllers/admin
Commit message (Expand)AuthorAgeFilesLines
* Profile requests when a header is passedfeature/profile-requests-conditionallyAhmad Sherif2016-07-261-0/+17
* Merge branch 'email-domain-blacklist' into 'master' Robert Speicher2016-07-201-1/+5
|\
| * Reorder allowed params for `ApplicationSetting` and add more details to docs.email-domain-blacklistPatricio Cano2016-07-191-3/+3
| * Refactor and rename `restricted_signup_domains` to `domain_whitelist` to bett...Patricio Cano2016-07-181-1/+1
| * Added the ability to block sign ups using a domain blacklist.Patricio Cano2016-07-181-0/+4
* | Merge branch 'issue_8110' into 'master' Rémy Coutable2016-07-201-12/+3
|\ \
| * | Refactor service settings viewissue_8110Felipe Artur2016-07-201-1/+1
| * | Add project service documentation and update integration documentationFelipe Artur2016-07-191-14/+2
| * | Allow slack service to send messages on different channelsFelipe Artur2016-07-191-2/+5
| |/
* | Allow to disable user request access to groups/projectsFelipe Artur2016-07-201-1/+1
|/
* Add Pending Tab to Admin BuildsKatarzyna Kobierska2016-07-181-1/+3
* Merge branch 'feature/option-set-new-users-external' into 'master' Rémy Coutable2016-07-081-0/+1
|\
| * Added setting to set new users by default as externalDravere2016-07-071-0/+1
* | Revert "Revert "Merge branch 'issue_3946' into 'master' ""Robert Speicher2016-07-071-2/+3
* | Revert "Merge branch 'issue_3946' into 'master' "Robert Speicher2016-07-071-3/+2
* | Layout for Users Groups and Projects on admin areaAlfredo Sumaran2016-07-071-2/+3
|/
* Rebasing caused `enabled_git_access_protocol` to become plural. Fixed here.Patricio Cano2016-07-051-1/+1
* Add setting that allows admins to choose which Git access protocols are enabledPatricio Cano2016-07-051-0/+1
* Merge branch 'explicit-requesters-scope' into 'master' Douwe Maan2016-07-012-1/+3
|\
| * Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scopeRémy Coutable2016-07-012-1/+3
* | 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
View Lorry Controller Status