summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Add ability to pass class name to spriteIcon helpersprite-icon-classClement Ho2017-10-121-1/+5
* Fixes from CSS refactorAnnabel Dunstone Gray2017-10-121-0/+2
* Resolve "Prometheus service page shows error"Jose Ivan Vargas Lopez2017-10-121-1/+5
* Merge branch '39033-d3-js-is-being-included-in-the-user_profile-and-graphs_sh...Tim Zallmann2017-10-122-7/+7
|\
| * Removed d3.js from the users and graphs bundle39033-d3-js-is-being-included-in-the-user_profile-and-graphs_show-bundlesJose Ivan Vargas2017-10-112-7/+7
* | Merge branch '39028-repo-by-url-fields' into 'master'Tim Zallmann2017-10-121-1/+5
|\ \
| * | Add project fields to import project by urlAnnabel Dunstone Gray2017-10-111-1/+5
* | | Merge branch '38871-cleanup-data-page-attribute-after-karma-test' into 'master'Clement Ho2017-10-115-6/+6
|\ \ \
| * | | Cleanup data-page attribute after each Karma test38871-cleanup-data-page-attribute-after-karma-testEric Eastwood2017-10-115-6/+6
* | | | Merge branch '37660-match-sidebar-colors' into 'master'Annabel Dunstone Gray2017-10-111-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | 37660 Change background color of nav sidebar to match other gl sidebars37660-match-sidebar-colorstauriedavis2017-10-101-1/+1
* | | | Merge branch 'ph-gl-form-js-modules' into 'master'Filipa Lacerda2017-10-117-122/+115
|\ \ \ \ | |_|_|/ |/| | |
| * | | spec fixesph-gl-form-js-modulesPhil Hughes2017-10-112-5/+5
| * | | Moves form related JS modules out of globalPhil Hughes2017-10-117-119/+112
| |/ /
* | | Simplify project pageAnnabel Dunstone Gray2017-10-116-60/+168
* | | Enable eslint in star and remove from main.jsFilipa Lacerda2017-10-112-20/+21
* | | Merge branch '38869-labels' into 'master'Phil Hughes2017-10-114-151/+137
|\ \ \ | |/ / |/| |
| * | Use ES6 modules in labels and labels managerFilipa Lacerda2017-10-104-151/+137
* | | Decreases z-index of select2 to a lower number than our navigation barFilipa Lacerda2017-10-101-0/+1
| |/ |/|
* | Remove not selector increasing specificity of rulesfix-dropdownFilipa Lacerda2017-10-102-2/+3
|/
* Merge branch '38869-u2f' into 'master'38968-label-picker-should-be-cleared-upon-selecting-a-labelPhil Hughes2017-10-107-223/+190
|\
| * Remove u2f from globalnamespace38869-u2fFilipa Lacerda2017-10-097-223/+190
* | Merge branch 'flash-es6-module' into 'master'Filipa Lacerda2017-10-1071-197/+179
|\ \
| * | removed global eslint for remaining filesflash-es6-modulePhil Hughes2017-10-105-8/+0
| * | fixed notes specsPhil Hughes2017-10-102-12/+10
| * | karma spec fixesPhil Hughes2017-10-104-13/+8
| * | fixed eslintPhil Hughes2017-10-101-8/+8
| * | flash testsPhil Hughes2017-10-101-11/+34
| * | spec fixesPhil Hughes2017-10-102-7/+12
| * | Flash is now a ES6 modulePhil Hughes2017-10-1067-179/+148
* | | Merge branch 'acet-fix-paste-on-comment-form' into 'master'Filipa Lacerda2017-10-101-1/+4
|\ \ \
| * | | Trigger change event of the markdown textarea to allow Vue catch the programm...acet-fix-paste-on-comment-formFatih Acet2017-09-271-1/+4
* | | | Remove Build code from global namespaceFilipa Lacerda2017-10-107-96/+86
| |/ / |/| |
* | | Merge branch '38869-api' into 'master'Phil Hughes2017-10-101-1/+0
|\ \ \
| * | | Remove Api from main.js38869-apiFilipa Lacerda2017-10-091-1/+0
| | |/ | |/|
* | | Fix bad type checking to prevent 0 count badge to be shownFilipa Lacerda2017-10-102-8/+25
|/ /
* | Merge branch '38534-minigraph' into 'master'Phil Hughes2017-10-092-4/+9
|\ \
| * | Fixes mini graph in commit view38534-minigraphFilipa Lacerda2017-10-092-4/+9
* | | Merge branch 'icons-update-fix-regression-on-groups' into 'master'Phil Hughes2017-10-092-2/+2
|\ \ \
| * | | Updated Icons + Fix for Collapsed Groups Angleicons-update-fix-regression-on-groupsTim Zallmann2017-10-092-2/+2
* | | | Removes CommitsList from global namespaceFilipa Lacerda2017-10-092-26/+27
| |/ / |/| |
* | | Merge branch 'abuse-reports-module' into 'master'Filipa Lacerda2017-10-093-6/+3
|\ \ \
| * | | Convert AbuseReports class to a moduleabuse-reports-modulePhil Hughes2017-10-063-6/+3
* | | | Remove AjaxLoadingSpinner and CreateLabelDropdown from global namespaceFilipa Lacerda2017-10-096-34/+29
* | | | Move cycle analytics banner into a vue fileFilipa Lacerda2017-10-092-0/+57
| |/ / |/| |
* | | Merge branch 'cleanup_old_nav_stuff' into 'master'Filipa Lacerda2017-10-0721-922/+497
|\ \ \
| * | | Fix dropdown header alignment; empty navbar positioningcleanup_old_nav_stuffAnnabel Dunstone Gray2017-10-072-18/+18
| * | | Specify gitlab navAnnabel Dunstone Gray2017-10-062-6/+6
| * | | Finish combining nav stylesAnnabel Dunstone Gray2017-10-065-477/+412
| * | | Fix specsAnnabel Dunstone Gray2017-10-062-0/+6
View Lorry Controller Status