summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 'remove-pages-css'remove-pages-cssAnnabel Dunstone Gray2016-12-0611-183/+122
|\
| * Merge branch 'remove-tags-scss' into 'master' Jacob Schatz2016-12-062-7/+10
| |\
| | * Remove tags.scssremove-tags-scssAnnabel Dunstone Gray2016-12-062-7/+10
| * | Merge branch 'admin-scss' into 'master' Jacob Schatz2016-12-069-176/+112
| |\ \ | | |/ | |/|
| | * Remove admin.scssadmin-scssAnnabel Dunstone Gray2016-12-058-128/+90
| | * Truncate fix, remove unneeded admin-specific cssAnnabel Dunstone Gray2016-12-054-48/+22
* | | Remove confirmation.scssAnnabel Dunstone Gray2016-12-061-32/+0
* | | Move award emojis to framworkAnnabel Dunstone Gray2016-12-062-0/+2
* | | Move image styles to frameworkAnnabel Dunstone Gray2016-12-061-0/+0
|/ /
* | Merge branch '25202-fix-mr-widget-content-wrapping' into 'master' Jacob Schatz2016-12-061-0/+5
|\ \
| * | Fixed MR widget content wrapping for XS viewportsRyan Harris2016-12-051-0/+5
* | | Merge branch 'remove-errors-scss' into 'master' Jacob Schatz2016-12-051-16/+0
|\ \ \
| * | | Remove unused errors cssremove-errors-scssAnnabel Dunstone Gray2016-12-051-16/+0
* | | | Remove unused votes.scssremove-votes-scssAnnabel Dunstone Gray2016-12-051-4/+0
|/ / /
* | | Merge branch '25221-fix-build-status-overflow-mobile' into 'master' Alfredo Sumaran2016-12-051-0/+1
|\ \ \ | |_|/ |/| |
| * | Fixed top margin for Builds page status header informationRyan Harris2016-12-031-0/+1
* | | Merge branch 'reduce-font-size' into 'master' Jacob Schatz2016-12-0513-19/+19
|\ \ \
| * | | Reduce base font sizes across appreduce-font-sizeAnnabel Dunstone Gray2016-12-0213-19/+19
* | | | Satisfied eslintSteffen Rauh2016-12-031-1/+1
* | | | Fix compatibility with Internet Explorer 11 for merge requestsSteffen Rauh2016-12-032-3/+15
| |/ / |/| |
* | | satisfy eslint no-param-reassign rule23696-fix-diff-view-highlightingMike Greiling2016-12-022-8/+10
* | | display error when a tab cannot be loadedMike Greiling2016-12-021-1/+5
* | | use shorthand instead of length > 0 (http://airbnb.io/javascript/#comparison-...Mike Greiling2016-12-021-1/+1
* | | use e instead of event variable nameMike Greiling2016-12-022-10/+10
* | | adjust scrollToElement to account for fixed merge request tabsMike Greiling2016-12-021-5/+7
* | | re-apply MR !6285 "Added forceLoad ability to singleFileDiffs, added callback...Luke Bennett2016-12-023-10/+32
* | | fix eslint failures on Diff and MergeRequestTabsMike Greiling2016-12-022-64/+63
* | | remove array destructuring until we can fix babel configMike Greiling2016-12-021-2/+6
* | | refactor Diff class event bindingsMike Greiling2016-12-021-48/+48
* | | refactor Diff to es6 class syntaxMike Greiling2016-12-023-42/+35
* | | prefer es6 string interpolation over concatinationMike Greiling2016-12-021-27/+26
* | | refactor awkward bind workarounds into arrow functionsMike Greiling2016-12-021-69/+44
* | | refactor MergeRequestTabs to es6 class syntaxMike Greiling2016-12-022-90/+87
* | | fix diff line highlighting by moving method from the MergeRequestTabs class t...Mike Greiling2016-12-022-42/+48
* | | temporarily revert "Added forceLoad ability to singleFileDiffs, added callbac...Mike Greiling2016-12-022-28/+9
|/ /
* | Merge branch 'system-font-test' into 'master' Jacob Schatz2016-12-0228-140/+1
|\ \
| * | Remove source sans prosystem-font-testAnnabel Dunstone Gray2016-12-0128-143/+1
| * | Use system fontAnnabel Dunstone Gray2016-12-011-1/+4
* | | Merge branch '25264-ref-commit' into 'master' Jacob Schatz2016-12-022-8/+8
|\ \ \
| * | | Change prop name to keep consistency with other props.25264-ref-commitFilipa Lacerda2016-12-021-4/+4
| * | | Adds changelog entryFilipa Lacerda2016-12-021-1/+1
| * | | Change ref property to commitRefFilipa Lacerda2016-12-022-8/+8
| | |/ | |/|
* | | Merge branch 'cleanup-common_utils.js' into 'master' Alfredo Sumaran2016-12-024-64/+29
|\ \ \
| * | | Clean up common_utils.js (!7318)winniehell2016-12-014-64/+29
* | | | Enable ColorVariable in scss-lintSam Rose2016-12-0167-954/+1977
| |/ / |/| |
* | | Merge branch '24726-remove-across-gitlab' into 'master' Annabel Dunstone Gray2016-12-012-6/+0
|\ \ \ | |/ / |/| |
| * | 24726 Remove Across GitLab from side navigation24726-remove-across-gitlabtauriedavis2016-12-012-6/+0
* | | Merge branch '24814-pipeline-tabs' into 'master' Fatih Acet2016-12-014-5/+146
|\ \ \
| * | | Improvements after review24814-pipeline-tabsFilipa Lacerda2016-11-304-21/+21
| * | | Fixes after reviewFilipa Lacerda2016-11-301-11/+3
View Lorry Controller Status