summaryrefslogtreecommitdiff
path: root/app/controllers/admin
Commit message (Expand)AuthorAgeFilesLines
* 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
| |_|_|/ |/| | |
* | | | 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
|\ \ \
| * | | Introduce maximum session time for terminal websocket connectionterminal-max-session-timeAdam Niedzielski2017-02-061-0/+1
| |/ /
* | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-032-2/+2
|\ \ \ | |/ /
| * | replace `find_with_namespace` with `find_by_full_path`Adam Pahlevi2017-02-032-2/+2
* | | Add GitLab PagesKamil Trzcinski2017-01-311-0/+1
|/ /
* | EE backport for new application settings serviceOswaldo Ferreira2017-01-231-1/+5
|/
* Add support for PlantUML diagrams in Asciidoc.Horacio Sanson2017-01-121-0/+2
* Refactor authorized params in Admin::UsersControllerrefactor-admin-controllers-paramsRémy Coutable2017-01-112-27/+32
* Refactor authorized params in Admin::GroupsControllerRémy Coutable2017-01-111-2/+6
* Refactor authorized params in Admin::ApplicationSettingsControllerRémy Coutable2017-01-111-45/+70
* Merged the 'groups' and 'projects' tabs when viewing user profilesJames Gregory2016-12-291-3/+0
* Fix: Admin group show page does not workfix-admin-group-pageValery Sizov2016-12-281-1/+1
* Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-271-2/+2
|\
| * Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-201-1/+4
| |\
| * \ Merge CSSFilipa Lacerda2016-12-121-1/+1
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-061-0/+1
| |\ \ \
| * | | | Allow admin to set keys with write access, andLin Jen-Shin2016-11-221-1/+1
| * | | | Don't notify user for deploy keys, feedback:Lin Jen-Shin2016-11-181-1/+1
* | | | | Add more storage statisticsMarkus Koller2016-12-212-4/+5
| |_|_|/ |/| | |
* | | | Implement minor changes from @dbalexandre's review.Timothy Andrew2016-12-161-2/+1
* | | | Allow creating personal access tokens / OAuth applications with scopes.Timothy Andrew2016-12-161-1/+5
| |_|/ |/| |
* | | Add nested groups support on data leveldz-nested-groupsDmitriy Zaporozhets2016-12-081-1/+1
| |/ |/|
* | Add new configuration setting to enable/disable HTML emails.24880-configurable-plaintext-emailsRuben Davila2016-11-281-0/+1
|/
* Allow the Sidekiq queues to throttle and the factor by which to throttle them...Patricio Cano2016-11-101-1/+3
* Allow certain Sidekiq jobs to be throttledPatricio Cano2016-11-101-0/+1
* Refine Git garbage collectionJacob Vosmaer2016-11-041-0/+5
* Allow multiple repository storage shards to be enabled, and automatically rou...Nick Thomas2016-11-041-1/+1
* Allow to search for user by secondary email address in the admin interfaceYar2016-11-011-1/+1
* Rename :name search parameter to :search_query at /admin/usersYar2016-11-011-1/+1
* Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-081-1/+1
|\
| * Enable CacheMarkdownField for the remaining modelsNick Thomas2016-10-071-1/+1
* | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-042-2/+2
|\ \ | |/
| * New AccessRequestsFinderRémy Coutable2016-09-282-2/+2
* | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-191-1/+9
|\ \ | |/
| * Syntax fixes and better tests for helper methods. Updated docs.group-specific-lfs-settingsPatricio Cano2016-09-151-4/+4
| * Added group-specific setting for LFS.Patricio Cano2016-09-151-1/+9