summaryrefslogtreecommitdiff
path: root/app/views/layouts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'li-fade'Dmitriy Zaporozhets2016-06-214-8/+8
|\
| * Add fade divs as li elementsli-fadeAnnabel Dunstone2016-06-204-8/+8
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-211-1/+1
|\ \
| * | Add tooltip on pin/unpin navAnnabel Dunstone2016-06-211-1/+1
| |/
* | Add arrow in horizontal scroll fadeAnnabel Dunstone2016-06-204-0/+8
|/
* Put some admin settings in dropdowndz-admin-tabs-dropdownDmitriy Zaporozhets2016-06-202-50/+65
* Move appearance settings as sub tab to application settingsdz-admin-tabsDmitriy Zaporozhets2016-06-201-6/+1
* Merge branch 'dz-organize-admin-settings' into 'master' Jacob Schatz2016-06-181-5/+1
|\
| * Move admin->runners tab as subnav of overview tabdz-organize-admin-settingsDmitriy Zaporozhets2016-06-161-5/+1
* | Merge branch '18724-dont-show-leave-project-to-group-member' into 'master' Douwe Maan2016-06-171-2/+3
|\ \
| * | Don't show 'Leave Project' to group members18724-dont-show-leave-project-to-group-memberRémy Coutable2016-06-171-2/+3
| |/
* | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-1611-129/+122
|\ \ | |/
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search...Fatih Acet2016-06-169-128/+96
| |\
| | * Merge branch 'pinned-sidebar' into 'master' Jacob Schatz2016-06-153-6/+9
| | |\
| | | * Moved pinned button to the bottomPhil Hughes2016-06-152-6/+5
| | | * Pinned sidebar navigation optionPhil Hughes2016-06-153-6/+10
| | * | Rearrange order of tabsAnnabel Dunstone2016-06-151-4/+4
| | * | Move builds tab to admin overviewAnnabel Dunstone2016-06-151-5/+1
| | * | Add monitoring link with subtabsAnnabel Dunstone2016-06-151-11/+4
| | * | Add sub links to overviewAnnabel Dunstone2016-06-151-14/+2
| | * | Add counter for abuse reportsAnnabel Dunstone2016-06-151-0/+1
| | * | Remove admin layout-nav countersAnnabel Dunstone2016-06-151-4/+0
| | * | Move admin nav to horizontal layout navAnnabel Dunstone2016-06-152-21/+4
| | |/
| | * Merge branch 'environments-and-deployments' into 'master' Rémy Coutable2016-06-151-1/+1
| | |\
| | | * Improve design after reviewKamil Trzcinski2016-06-141-1/+1
| | * | Merge branch 'fix-header-logo-link' into 'master' Jacob Schatz2016-06-151-1/+1
| | |\ \
| | | * | Fix #18604, logo in header wasn't an anchor link.fix-header-logo-linkConnor Shea2016-06-141-1/+1
| | * | | Merge branch 'manual-todos-issuable-sidebar' into 'master' Stan Hu2016-06-141-3/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Returns created todos to control rather than re-queryPhil Hughes2016-06-141-1/+1
| | | * | Manually create todo for issuablePhil Hughes2016-06-141-3/+2
| | * | | Merge branch '18539-nav-alignment' into 'master' Jacob Schatz2016-06-141-10/+20
| | |\ \ \
| | | * | | Put all sidebar icons in fixed width containerAnnabel Dunstone2016-06-141-10/+20
| | | |/ /
| | * | | Merge branch 'master' into 13948-access-request-to-projects-and-groupsDouwe Maan2016-06-142-39/+40
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge branch 'settings-dropdown-permissions' into 'master' Dmitriy Zaporozhets2016-06-142-49/+50
| | | |\ \ | | | | |/ | | | |/|
| | | | * Pass can_edit and access to partial.Connor Shea2016-06-132-3/+1
| | | | * Fix a bug that allowed Guests to still see Settings links they couldn't access.Connor Shea2016-06-101-1/+2
| | | | * Fix displaying of project settings links the user cannot access.Connor Shea2016-06-102-48/+50
| | * | | UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-142-24/+29
| | * | | Add request access for groupsRémy Coutable2016-06-142-36/+11
| | * | | Initial implementation of user access request to projectsDavid Alexander2016-06-141-0/+18
| | |/ /
| * | | Escape JavaScript in haml template.category-search-dropdownFatih Acet2016-06-141-6/+6
| * | | Defensive check for the group options.Fatih Acet2016-06-131-1/+1
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search...Fatih Acet2016-06-1310-93/+52
| |\ \ \ | | |/ /
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search...Fatih Acet2016-06-096-49/+47
| |\ \ \
| * | | | Inject group options.Fatih Acet2016-06-092-2/+12
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search...Fatih Acet2016-06-083-29/+22
| |\ \ \ \
| * | | | | Added projectOptions and dashboardOptions into gl object.Fatih Acet2016-06-071-0/+15
| * | | | | Added data-project attribute to body tag.Fatih Acet2016-06-071-1/+1
* | | | | | Implement @DouweM's feedback.Timothy Andrew2016-06-161-1/+0
* | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-1410-93/+52
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |