summaryrefslogtreecommitdiff
path: root/app/controllers/admin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-disable-2fa-by-admin' into 'master'Dmitriy Zaporozhets2015-07-131-0/+6
|\
| * Add disable_two_factor route for Admin::UsersRobert Speicher2015-07-101-0/+6
* | Fix transferring of project to another group using the API.Douwe Maan2015-07-111-1/+2
|/
* Add support for unlocking users in admin settingsStan Hu2015-07-021-0/+8
* Merge branch 'admin-edit-identities' into 'master'Dmitriy Zaporozhets2015-06-232-1/+51
|\
| * Fix admin identities codeDmitriy Zaporozhets2015-06-231-1/+1
| * Address review commentsDmitriy Zaporozhets2015-06-221-7/+5
| * Refactor admin user pageDmitriy Zaporozhets2015-06-221-1/+10
| * Move identities list to own controller actionDmitriy Zaporozhets2015-06-191-4/+8
| * Add ability for admin to edit user identityDmitriy Zaporozhets2015-06-191-4/+22
| * Admin can see and remove user identitiesDmitriy Zaporozhets2015-06-191-0/+21
* | Fix error when deleting a user who has projectsStan Hu2015-06-231-1/+1
|/
* Merge branch 'feature-session-expire-seconds-ui' into 'master'Douwe Maan2015-06-121-0/+1
|\
| * session_expire_seconds => session_expire_delaythemaze752015-06-101-1/+1
| * Add session expiration delay configuration through UI applicationEric Maziade2015-06-051-0/+1
* | An `in_namespace` scope is already presentzenati2015-06-091-1/+1
|/
* Remove show actions from Admin and Project DeployKeysRobert Speicher2015-06-031-6/+1
* Wrap group removal into serviceDmitriy Zaporozhets2015-06-031-1/+1
* Allow to configure a URL to show after sign outAlex Lossent2015-05-291-0/+1
* Add option to disallow users from registering any application to use GitLab a...user-oauth-applicationsDouwe Maan2015-05-291-0/+1
* You can not remove user if he/she is an only owner of groupDmitriy Zaporozhets2015-05-281-5/+1
* Merge branch 'version-check' into 'master'Dmitriy Zaporozhets2015-05-131-0/+1
|\
| * Fix syntax errorDmitriy Zaporozhets2015-05-081-1/+1
| * Merge branch 'version-check' into gl-version-checkDmitriy Zaporozhets2015-05-081-0/+1
| |\
| | * Add feature to disable version checkDmitriy Zaporozhets2015-03-101-1/+2
* | | Added X-GitLab-Event header for web hooksbugagazavr2015-05-081-1/+1
|/ /
* | Merge branch 'change-primary-email' into 'master'Dmitriy Zaporozhets2015-05-031-2/+1
|\ \
| * | Allow primary email to be set to an email that you've already added.change-primary-emailDouwe Maan2015-04-301-2/+1
* | | Add application setting to restrict user signups to e-mail domainsStan Hu2015-05-021-1/+2
* | | Add helpers for header title and sidebar, and move setting those from control...Douwe Maan2015-05-011-7/+1
* | | Add a page title to every page.Douwe Maan2015-04-301-1/+7
|/ /
* | Revert "Added X-GitLab-Event header for web hooks"Valery Sizov2015-04-271-1/+1
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-271-1/+1
|\ \
| * | Added X-GitLab-Event header for web hooksbugagazavr2015-04-251-1/+1
* | | Add new admin settingsVinnie Okada2015-04-261-0/+2
|/ /
* | Fix bug where Slack service channel was not saved in admin template settings.Stan Hu2015-04-241-10/+1
* | Fixed the Rails/ActionFilter copJeroen van Baarsen2015-04-209-13/+13
* | Track who created a group or project member.Douwe Maan2015-04-141-1/+1
* | Merge branch 'skip-email-reconfirmation' into 'master'Dmitriy Zaporozhets2015-04-131-1/+1
|\ \
| * | Skip email confirmation when set by admin or via LDAP.skip-email-reconfirmationDouwe Maan2015-04-061-1/+1
* | | Clean up code.Douwe Maan2015-04-031-5/+9
* | | Allow admin to create public deploy keys that are accessible to any project.Douwe Maan2015-04-031-0/+45
|/ /
* | Support configurable attachment size via Application SettingsStan Hu2015-04-021-0/+1
* | Include missing events and fix save functionality in admin service template s...Stan Hu2015-03-231-1/+3
* | Fix restricted visibility bugsVinnie Okada2015-03-161-1/+3
* | Merge branch 'fix-restricted-visibility' into 'master'Dmitriy Zaporozhets2015-03-161-1/+9
|\ \
| * \ Merge branch 'master' into fix-restricted-visibilityVinnie Okada2015-03-144-9/+10
| |\ \
| * | | Move restricted visibility settings to the UIVinnie Okada2015-03-071-1/+9
* | | | Use `project_member` instead of `team_member`.Douwe Maan2015-03-151-2/+2
| |/ / |/| |
* | | Use same constant for amount of items per pageDmitriy Zaporozhets2015-03-122-6/+6
| |/ |/|
View Lorry Controller Status