summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '37220-es-modules' into 'master'Phil Hughes2017-09-2135-534/+563
|\
| * Exports all the methods in the same place37220-es-modulesFilipa Lacerda2017-09-181-25/+28
| * Merge branch 'master' into 37220-es-modulesMike Greiling2017-09-1826-252/+540
| |\
| * | Fix context for jquery eventFilipa Lacerda2017-09-151-7/+5
| * | fixed todos specPhil Hughes2017-09-121-11/+6
| * | Merge branch 'master' into 37220-es-modulesFilipa Lacerda2017-09-1212-41/+33
| |\ \
| * | | Import modules instead of using the ones in global namespaceFilipa Lacerda2017-09-0926-85/+105
| * | | Use modules in common utilsFilipa Lacerda2017-09-0913-460/+472
* | | | Merge branch 'resolve-discussions-btn' into 'master'Phil Hughes2017-09-211-14/+6
|\ \ \ \
| * | | | Make resolve discussion icon grayresolve-discussions-btnAnnabel Dunstone Gray2017-09-201-14/+6
* | | | | Merge branch 'fix-image-diff-swipe-handle' into 'master'Annabel Dunstone Gray2017-09-201-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix image diff swipe handle offset to correctly align with the framefix-image-diff-swipe-handleClement Ho2017-09-201-1/+2
* | | | | Merge branch '37862-breadcrumbs-mobile' into 'master'Tim Zallmann2017-09-202-5/+12
|\ \ \ \ \
| * | | | | Vertically center hamburger button37862-breadcrumbs-mobileAnnabel Dunstone Gray2017-09-182-7/+3
| * | | | | Increase tap target on hamburger menuAnnabel Dunstone Gray2017-09-152-3/+8
| * | | | | Fix mobile sidebar button to match height of desktop breadcrumbsAnnabel Dunstone Gray2017-09-141-0/+6
* | | | | | Merge branch '36884-gitaly-admin-version' into 'master'Tim Zallmann2017-09-201-0/+6
|\ \ \ \ \ \
| * | | | | | Add Gitaly version to Admin DashboardJacopo2017-09-191-0/+6
* | | | | | | Merge branch '37298-the-prettytime-utils-module-could-use-some-light-maintena...Fatih Acet2017-09-193-73/+56
|\ \ \ \ \ \ \
| * | | | | | | Lightly refactor prettyTime module.37298-the-prettytime-utils-module-could-use-some-light-maintenanceBryce Johnson2017-09-143-73/+56
* | | | | | | | Merge branch 'revert-feature-highlight' into 'master'Jacob Schatz2017-09-197-236/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert feature highlightClement Ho2017-09-197-236/+7
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Only show the sidebar scroll bars if the user can scrollsidebar-sidebars-only-when-scrollPhil Hughes2017-09-192-1/+16
* | | | | | | | Change all instances of btn-sm to btn-small to keep things consistentJedidiah2017-09-196-8/+7
* | | | | | | | Merge branch 'repo-editor-ui-fix' into 'master'Jacob Schatz2017-09-191-4/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | RepoEditor: Add hover color for the close icon.repo-editor-ui-fixFatih Acet2017-09-141-0/+4
| * | | | | | | | RepoEditor: Fix height of the file list.Fatih Acet2017-09-141-1/+0
| * | | | | | | | RepoEditor: Improve tab spacing and styling.Fatih Acet2017-09-141-3/+2
* | | | | | | | | Fix MR widget with external CI services/integrations33287-fix-mr-widget-errors-with-external-servicesEric Eastwood2017-09-184-9/+24
* | | | | | | | | Merge branch '37259-some-mr-ready-mobile-fixes' into 'master'Fatih Acet2017-09-183-3/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix MR ready to merge buttons/controls at mobile breakpoint37259-some-mr-ready-mobile-fixesEric Eastwood2017-09-133-3/+11
* | | | | | | | | | Merge branch '37465-fix-line-resolve-all-green-checkmark-icon' into 'master'Annabel Dunstone Gray2017-09-181-1/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Update line-resolve-all checkmark to be green when all discussions resolved37465-fix-line-resolve-all-green-checkmark-iconEric Eastwood2017-09-131-1/+2
* | | | | | | | | | Merge branch '37590-pipelines-mr' into 'master'Annabel Dunstone Gray2017-09-181-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix mini graph pipeline breakin in merge request view37590-pipelines-mrFilipa Lacerda2017-09-151-0/+5
* | | | | | | | | | | Merge branch 'winh-missing-javascript-imports' into 'master'Tim Zallmann2017-09-183-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Add missing import statementswinh-missing-javascript-importswinh2017-09-183-0/+5
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'role-badge-fix' into 'master'Douwe Maan2017-09-181-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | IssueNotes: Fix role badge styling.role-badge-fixFatih Acet2017-09-141-1/+1
* | | | | | | | | | | Remove gaps under nav on build pageAnnabel Dunstone Gray2017-09-182-7/+7
* | | | | | | | | | | Fixed the new sidebars width when browser has scrollbarsPhil Hughes2017-09-162-8/+10
* | | | | | | | | | | Display whether branch has been merged when deleting protected branchWinnie Hellmann2017-09-151-2/+6
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'revert-sidebar-title-attribute' into 'master'Filipa Lacerda2017-09-151-5/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Remove title attribute from sidebar elementsPhil Hughes2017-09-131-5/+0
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '20824-scope-users-to-members-in-group-issuable-list' into 'master'Phil Hughes2017-09-151-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Return only group's members in user dropdowns on issuables list pages20824-scope-users-to-members-in-group-issuable-listRémy Coutable2017-09-141-0/+5
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '37844-layout-nav-space' into 'master'Phil Hughes2017-09-151-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Remove extra space between profile header and navbar37844-layout-nav-spaceAnnabel Dunstone Gray2017-09-141-1/+1
* | | | | | | | | Merge branch 'changes-overflow-fix' into 'master'Annabel Dunstone Gray2017-09-141-1/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Fixed overflow issue in changes dropdownchanges-overflow-fixPhil Hughes2017-09-131-1/+9
| | |_|/ / / / / | |/| | | | | |