summaryrefslogtreecommitdiff
path: root/app/views/admin
Commit message (Expand)AuthorAgeFilesLines
* Add support for PlantUML diagrams in Asciidoc.Horacio Sanson2017-01-121-0/+17
* HAMLLint: Fix `SpaceInsideHashAttributes` offencesKushal Pandya2016-12-319-10/+10
* HAMLLint: Fix `SpaceBeforeScript` offencesKushal Pandya2016-12-312-2/+2
* HAMLLint: Fix `ImplicitDiv` offencesKushal Pandya2016-12-312-3/+2
* Merged the 'groups' and 'projects' tabs when viewing user profilesJames Gregory2016-12-293-28/+12
* Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-272-25/+40
|\
| * Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-209-17/+25
| |\
| * \ Merge CSSFilipa Lacerda2016-12-124-17/+15
| |\ \
| * | | Adds CSS to match the mockups and makes table responsiveFilipa Lacerda2016-12-121-31/+32
| * | | Use btn-inverted for New Deploy KeyLin Jen-Shin2016-12-121-1/+1
| * | | Use consistent words, feedback:Lin Jen-Shin2016-12-102-2/+2
| * | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-063-9/+17
| |\ \ \
| * | | | Allow admin to set keys with write access, andLin Jen-Shin2016-11-222-0/+14
* | | | | Add more storage statisticsMarkus Koller2016-12-215-9/+33
| |_|_|/ |/| | |
* | | | Merge branch '20492-access-token-scopes' into 'master' Rémy Coutable2016-12-162-2/+10
|\ \ \ \
| * | | | View-related (and other minor) changes to !5951 based on @rymai's review.Timothy Andrew2016-12-162-6/+2
| * | | | Move the scopes form/list view into a partial.Timothy Andrew2016-12-161-10/+1
| * | | | Allow creating personal access tokens / OAuth applications with scopes.Timothy Andrew2016-12-162-2/+23
* | | | | Merge branch 'dz-nested-groups-title-ui' into 'master' Sean McGivern2016-12-162-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use full group name for admin group index and show pagesDmitriy Zaporozhets2016-12-132-2/+2
| | |_|/ | |/| |
* | | | Remove white space between nav itemsfix-navigation-white-spaceAlfredo Sumaran2016-12-141-1/+1
* | | | Merge branch 'dz-fix-admin-routes' into 'master' Sean McGivern2016-12-145-11/+11
|\ \ \ \
| * | | | Add support for nested groups to admin routingdz-fix-admin-routesDmitriy Zaporozhets2016-12-115-11/+11
| |/ / /
* | | | Improve detailed status badge partialGrzegorz Bizon2016-12-121-1/+1
* | | | Rename icon_with_label to icon_with_descriptionKamil Trzcinski2016-12-121-1/+1
* | | | Remove ci_status_with_icon helper and replace it with partial [ci skip]Kamil Trzcinski2016-12-121-1/+1
|/ / /
* | | Merge branch 'admin-scss' into 'master' Jacob Schatz2016-12-064-17/+15
|\ \ \ | |_|/ |/| |
| * | Remove admin.scssadmin-scssAnnabel Dunstone Gray2016-12-053-11/+9
| * | Truncate fix, remove unneeded admin-specific cssAnnabel Dunstone Gray2016-12-051-6/+6
* | | The admin user projects view now has a clickable group linkJames Gregory2016-12-021-1/+1
|/ /
* | Add new configuration setting to enable/disable HTML emails.24880-configurable-plaintext-emailsRuben Davila2016-11-281-1/+10
* | Merge branch '24161-non-intuitive-buttons-for-import-sources-in-administrator...Fatih Acet2016-11-221-4/+2
|\ \
| * | Swapped buttons for checkboxes24161-non-intuitive-buttons-for-import-sources-in-administrator-settings-enable-disableLuke "Jared" Bennett2016-11-211-4/+2
* | | Merge branch 'zj-mattermost-command-help-message' into 'master' Fatih Acet2016-11-221-3/+4
|\ \ \ | |_|/ |/| |
| * | Pass @service using subjectLuke "Jared" Bennett2016-11-211-1/+1
| * | Added new .help-form styling and implemented with mattermost command service ...Luke "Jared" Bennett2016-11-211-2/+3
| |/
* | Merge branch '18136-ui-for-restricting-global-visibility-levels-is-unclear' i...Jacob Schatz2016-11-221-3/+2
|\ \ | |/ |/|
| * Removed button styling from restricted visibility levels and added checkboxes...18136-ui-for-restricting-global-visibility-levels-is-unclearLuke "Jared" Bennett2016-11-211-3/+2
* | Merge branch 'fix-admin-ci-table' into 'master' Annabel Dunstone Gray2016-11-181-1/+1
|\ \
| * | Fix misaligned buttons on admin builds pageDidem Acet2016-11-171-1/+1
| |/
* | Fix Admin Links to new Group does not respect Default Visibilityjacopo-beschi-intersail2016-11-183-3/+3
|/
* Refactored Sidekiq Throttler and updated documentationsidekiq-job-throttlingPatricio Cano2016-11-111-2/+2
* Allow the Sidekiq queues to throttle and the factor by which to throttle them...Patricio Cano2016-11-101-0/+12
* Allow certain Sidekiq jobs to be throttledPatricio Cano2016-11-101-0/+13
* Use the Gitlab Workhorse HTTP header in the admin dashboard21664-incorrect-workhorse-version-number-displayedChris Wright2016-11-071-1/+1
* Merge branch 'jacobvosmaer-gitlab/gitlab-ce-git-gc-improvements' into 'master' Douwe Maan2016-11-071-0/+39
|\
| * Refine Git garbage collectionJacob Vosmaer2016-11-041-0/+39
* | Merge branch 'remove-wiki-image-border-radius' into 'master' Fatih Acet2016-11-043-3/+3
|\ \ | |/ |/|
| * Update avatar container name so it doesnt conflict with other image containersremove-wiki-image-border-radiusAnnabel Dunstone Gray2016-11-033-3/+3
* | Merge branch '24059-round-robin-repository-storage' into 'master' Douwe Maan2016-11-041-2/+2
|\ \