summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Remove initLegacyFilters reference in dispatcherdispatcher-dashboard-mrClement Ho2018-01-101-1/+0
* Refactor dispatcher dashboard mr pathClement Ho2018-01-102-2/+10
* Merge branch 'merge-request-lfs-badge' into 'master'Douwe Maan2018-01-101-0/+3
|\
| * Added LFS to merge request files tracked by LFSmerge-request-lfs-badgePhil Hughes2018-01-101-0/+3
* | Merge branch 'ph-dispatcher-1' into 'master'Filipa Lacerda2018-01-106-8/+25
|\ \
| * | Added admin:conversational_development_index:show import to dispatcherph-dispatcher-1Phil Hughes2018-01-092-1/+4
| * | Added import:fogbugz:new_user_map import to dispatcherPhil Hughes2018-01-092-1/+4
| * | Added ci:lints import to dispatcherPhil Hughes2018-01-093-2/+4
| * | Added import for snippets:show in dispatcherPhil Hughes2018-01-092-4/+13
* | | Merge branch '34312-eslint-vue-plugin' into 'master'Phil Hughes2018-01-10181-5129/+5776
|\ \ \ | |_|/ |/| |
| * | Fix broken modalFilipa Lacerda2018-01-101-1/+1
| * | Disable rule in modal.vue breaking testsFilipa Lacerda2018-01-091-5/+3
| * | Fix broken testsFilipa Lacerda2018-01-092-100/+98
| * | Fix broken specsFilipa Lacerda2018-01-095-22/+10
| * | Fix broken test for application rowFilipa Lacerda2018-01-091-2/+2
| * | Fix broken tests for project list and headerFilipa Lacerda2018-01-092-2/+2
| * | Fix application row specsFilipa Lacerda2018-01-091-7/+7
| * | [ci skip] Fix pagination specsFilipa Lacerda2018-01-091-4/+3
| * | Fix last eslint rulesFilipa Lacerda2018-01-088-155/+167
| * | Fix more eslint rulesFilipa Lacerda2018-01-0827-353/+402
| * | Merge branch 'master' into 34312-eslint-vue-pluginFilipa Lacerda2018-01-0859-681/+958
| |\ \
| * | | Fixes more eslint rulesFilipa Lacerda2018-01-0627-455/+486
| * | | [ci skip] Fix more eslint rulesFilipa Lacerda2018-01-0628-531/+593
| * | | [ci skip] Fix conflictsFilipa Lacerda2018-01-051-28/+4
| * | | Merge branch 'master' into 34312-eslint-vue-pluginFilipa Lacerda2018-01-0568-343/+864
| |\ \ \
| * | | | [ci skip] Fix more eslint rulesFilipa Lacerda2018-01-057-380/+380
| * | | | [ci skip] Fix more rulesFilipa Lacerda2018-01-0534-920/+1035
| * | | | [ci skip] Fix more eslint rulesFilipa Lacerda2018-01-0510-272/+415
| * | | | [ci skip] Fix more rulesFilipa Lacerda2018-01-0574-2160/+2377
| * | | | [ci skip] Fix more rulesFilipa Lacerda2018-01-0415-469/+464
| * | | | [ci skip] Fix some rulesFilipa Lacerda2018-01-047-134/+155
| * | | | Merge branch 'master' into 34312-eslint-vue-pluginFilipa Lacerda2018-01-0443-165/+607
| |\ \ \ \
| * | | | | Adds `eslint-plugin-vue`, fixes linter errors and adds docsFilipa Lacerda2018-01-0327-214/+265
* | | | | | Merge branch 'dispatcher-dashboard-projects' into 'master'Phil Hughes2018-01-102-0/+7
|\ \ \ \ \ \
| * | | | | | Fix indentiondispatcher-dashboard-projectsClement Ho2018-01-091-1/+3
| * | | | | | Refactor dispatcher dashboard projects routeClement Ho2018-01-092-0/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'dispatcher-dashboard-issues' into 'master'Phil Hughes2018-01-102-0/+11
|\ \ \ \ \ \
| * | | | | | Fix indentiondispatcher-dashboard-issuesClement Ho2018-01-091-1/+3
| * | | | | | Fix eslintClement Ho2018-01-081-1/+1
| * | | | | | Refactor dashboard issuesClement Ho2018-01-082-0/+9
| |/ / / / /
* | | | | | Refactor dashboard milestone show inside dispatcherClement Ho2018-01-102-1/+12
* | | | | | Refactor dashboard milestone index inside dispatcherClement Ho2018-01-102-1/+6
* | | | | | Merge branch 'fix/sidebar-collapse-button-spacing' into 'master'Phil Hughes2018-01-101-1/+0
|\ \ \ \ \ \
| * | | | | | Restore sidebar collapse button paddingGeorge Tsiolis2018-01-091-1/+0
* | | | | | | Fix hooks not being set up properly for bare import Rake tasksh-fix-bare-import-hooksStan Hu2018-01-091-0/+4
* | | | | | | Revert "Fix Route validation for unchanged path"Michael Kozono2018-01-091-1/+1
* | | | | | | Fix Route validation for unchanged pathMichael Kozono2018-01-091-1/+1
* | | | | | | Merge branch '41570-max-height-dropdown' into 'master'Phil Hughes2018-01-095-11/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Change max-height of all dropdowns to 312px41570-max-height-dropdownAnnabel Dunstone Gray2018-01-085-11/+7
* | | | | | | Merge branch 'changes-dropdown-ellipsis' into 'master'Sean McGivern2018-01-093-4/+10
|\ \ \ \ \ \ \