summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fly-out-tunnel' into 'master'Filipa Lacerda2017-08-142-41/+128
|\
| * moved timeout to a variablefly-out-tunnelPhil Hughes2017-08-141-4/+8
| * fixed up specs caused by left over elements in the bodyPhil Hughes2017-08-141-1/+2
| * fixed JS error when no sidebar existsPhil Hughes2017-08-141-0/+3
| * Add dynamic navigation tunnel to fly-out menusPhil Hughes2017-08-142-41/+120
* | Merge branch '36133-project-overview-page-doesn-t-load-commit-metadata-for-re...Tim Zallmann2017-08-141-0/+3
|\ \
| * \ Merge branch 'master' into '36133-project-overview-page-doesn-t-load-commit-m...36133-project-overview-page-doesn-t-load-commit-metadata-for-repo-viewMike Greiling2017-08-1015-38/+98
| |\ \
| * | | fix commit metadata in project:show pageMike Greiling2017-08-081-0/+3
* | | | Merge branch '36325-increase-z-index-pipeline-dropdown' into 'master'Phil Hughes2017-08-141-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Increase z-index of pipeline dropdown36325-increase-z-index-pipeline-dropdownAnnabel Dunstone Gray2017-08-111-0/+1
* | | | fix confidential border issue as well as confidential styles leaking on new MRRegis Boudinot2017-08-111-16/+4
* | | | Merge branch 'import-project-modal-fix' into 'master'docs-group-milestonesFilipa Lacerda2017-08-111-1/+1
|\ \ \ \
| * | | | Fixes the correct import modal window not showingimport-project-modal-fixPhil Hughes2017-08-111-1/+1
* | | | | Merge branch 'winh-git-revision-dropdown-style' into 'master'Annabel Dunstone Gray2017-08-112-4/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Make Git revision dropdown style consistentwinh-git-revision-dropdown-stylewinh2017-08-092-4/+6
* | | | | Merge branch '36270-collapsed-sidebar-scroll' into 'master'Phil Hughes2017-08-111-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Hide overflow-x on collapsed sidebar36270-collapsed-sidebar-scrollAnnabel Dunstone Gray2017-08-101-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'breakpoint-checker-performance' into 'master'Filipa Lacerda2017-08-1010-91/+32
|\ \ \ \
| * | | | removed global use of breakpoint checkerbreakpoint-checker-performancePhil Hughes2017-08-1010-33/+17
| * | | | Increase performance of the breakpoint size checkerPhil Hughes2017-08-101-61/+18
* | | | | Fix line numbers not matching up to code in code viewer.Trevor Flynn2017-08-101-1/+1
* | | | | Merge branch 'remove-affix-issuable-sidebar-new-nav' into 'master'Filipa Lacerda2017-08-101-0/+3
|\ \ \ \ \
| * | | | | Remove affix plugin from issuable sidebar with new navigationremove-affix-issuable-sidebar-new-navPhil Hughes2017-08-101-0/+3
| | |/ / / | |/| | |
* | | | | Merge branch '36158-new-issue-button' into 'master'Phil Hughes2017-08-102-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Render new issue link in failed job as a regular link instead of a UJS one36158-new-issue-buttonFilipa Lacerda2017-08-102-3/+3
* | | | | Merge branch '36185-or-separator' into 'master'Phil Hughes2017-08-101-5/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix linter error36185-or-separatorFilipa Lacerda2017-08-101-1/+1
| * | | | Aligns OR separater to center properlyFilipa Lacerda2017-08-101-5/+5
| |/ / /
* | | | Merge branch 'fixed-sticky-stats-box-commit-view' into 'master'Filipa Lacerda2017-08-104-12/+20
|\ \ \ \
| * | | | Fix the sticky changes bar on commits pagefixed-sticky-stats-box-commit-viewPhil Hughes2017-08-094-12/+20
| |/ / /
* | | | Merge branch 'fly-out-fix-hiding' into 'master'Filipa Lacerda2017-08-101-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Removed display styles when hiding the fly out navigationfly-out-fix-hidingPhil Hughes2017-08-091-1/+2
* | | | Merge branch '35996-icon-hover-color' into 'master'Phil Hughes2017-08-091-0/+4
|\ \ \ \
| * | | | Update icon color on hover35996-icon-hover-colorAnnabel Dunstone Gray2017-08-081-0/+4
| | |/ / | |/| |
* | | | Merge branch 'mr-changes-container-full-width' into 'master'Annabel Dunstone Gray2017-08-091-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixed merge request changes sticky container not spreading full widthmr-changes-container-full-widthPhil Hughes2017-08-081-1/+1
| | |/ | |/|
* | | Merge branch '36179-align-nav-items' into 'master'Phil Hughes2017-08-091-1/+2
|\ \ \
| * | | Align all nav items in sidebar36179-align-nav-itemsAnnabel Dunstone Gray2017-08-081-1/+2
| | |/ | |/|
* | | Merge branch 'fix-collapsed-sidebar-item-height' into 'master'Phil Hughes2017-08-091-2/+5
|\ \ \
| * | | Fix height of collapsed sidebar itemsfix-collapsed-sidebar-item-heightAnnabel Dunstone Gray2017-08-081-2/+5
| |/ /
* | | Fix pikaday being undefinedPhil Hughes2017-08-094-5/+5
|/ /
* | Fix fly-out navigation not showing for active items in collapsed sidebarPhil Hughes2017-08-082-6/+25
* | Merge branch '35052-please-select-a-file-when-attempting-to-upload-or-replace...Filipa Lacerda2017-08-084-3/+35
|\ \
| * | disable file upload button while uploading35052-please-select-a-file-when-attempting-to-upload-or-replace-from-the-uiSimon Knox2017-08-084-3/+35
* | | Merge branch 'fly-out-min-width' into 'master'Annabel Dunstone Gray2017-08-081-1/+1
|\ \ \
| * | | Fix fly-out width when it has long itemsfly-out-min-widthPhil Hughes2017-08-081-1/+1
| | |/ | |/|
* | | Merge branch 'header-z-index-fix' into 'master'Annabel Dunstone Gray2017-08-082-1/+3
|\ \ \
| * | | Fixed modals being below navbarheader-z-index-fixPhil Hughes2017-08-072-1/+3
* | | | Merge branch 'project-homepage-activity' into 'master'Tim Zallmann2017-08-081-0/+1
|\ \ \ \
| * | | | Fixed activity not loading on project homepageproject-homepage-activityPhil Hughes2017-08-081-0/+1
| | |/ / | |/| |