summaryrefslogtreecommitdiff
path: root/app/views/admin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '21518_recaptcha_spam_issues' into 'master'Sean McGivern2017-02-072-0/+3
|\
| * Use reCaptcha when an issue identified as spamJarka Kadlecova2017-02-072-0/+3
* | Merge branch 'ee-1439-read-only-user' into 'master' Douwe Maan2017-02-072-22/+38
|\ \
| * | More backportDouwe Maan2017-02-061-4/+13
| * | Backport of the frontend view, including testsJose Ivan Vargas2017-02-061-6/+12
| * | Backport UI changes from gitlab-org/gitlab-ee!998Timothy Andrew2017-02-062-22/+23
* | | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-062-8/+15
|\ \ \
| * \ \ Merge branch 'redesign-searchbar-admin-project-26794' into 'master'Jacob Schatz2017-02-061-8/+5
| |\ \ \ | | |_|/ | |/| |
| | * | hides search buttonNur Rony2017-01-311-0/+1
| | * | layout rearrangedNur Rony2017-01-301-8/+4
| * | | Introduce maximum session time for terminal websocket connectionterminal-max-session-timeAdam Niedzielski2017-02-061-0/+10
| | |/ | |/|
* | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-035-13/+13
|\ \ \ | |/ /
| * | Fix broken tests17662-rename-buildsFilipa Lacerda2017-02-031-1/+1
| * | Adds changelog entryFilipa Lacerda2017-02-034-12/+12
| |/
* | Add GitLab PagesKamil Trzcinski2017-01-311-0/+8
|/
* HAMLLint: Fix `UnnecessaryInterpolation` and `UnnecessaryStringOutput` offenc...22072-enable-haml-linters-phase-2Kushal Pandya2017-01-241-1/+1
* HAMLLint: Fix `UnnecessaryStringOutput` offencesKushal Pandya2017-01-243-5/+5
* HAMLLint: Fix `UnnecessaryInterpolation` offencesKushal Pandya2017-01-244-5/+5
* 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
|\ \
View Lorry Controller Status