summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 41723-babel41723-babelFilipa Lacerda2018-01-10263-5340/+6967
|\
| * 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 'docs/ci-cd-ref-note' into 'master'Marcia Ramos2018-01-101-9/+10
| |\ \
| | * | Change order of reference notes in permissions docsdocs/ci-cd-ref-noteJohn Doe2018-01-101-9/+10
| * | | Merge branch '34312-eslint-vue-plugin' into 'master'Phil Hughes2018-01-10193-5178/+5878
| |\ \ \
| | * | | Adds explanation to .codeclimate.yml file34312-eslint-vue-pluginFilipa Lacerda2018-01-101-0/+1
| | * | | Disable eslint in codeclimateFilipa Lacerda2018-01-101-1/+1
| | * | | 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-094-104/+102
| | * | | Fix broken specsFilipa Lacerda2018-01-0911-50/+25
| | * | | 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-092-5/+3
| | * | | Fix last eslint rulesFilipa Lacerda2018-01-089-156/+169
| | * | | Fix more eslint rulesFilipa Lacerda2018-01-0827-353/+402
| | * | | Merge branch 'master' into 34312-eslint-vue-pluginFilipa Lacerda2018-01-08197-2884/+12637
| | |\ \ \
| | * | | | Fixes more eslint rulesFilipa Lacerda2018-01-0627-455/+486
| | * | | | [ci skip] Fix more eslint rulesFilipa Lacerda2018-01-0629-534/+595
| | * | | | [ci skip] Fix conflictsFilipa Lacerda2018-01-051-28/+4
| | * | | | Merge branch 'master' into 34312-eslint-vue-pluginFilipa Lacerda2018-01-05218-1140/+3570
| | |\ \ \ \
| | * | | | | [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-0418-478/+483
| | * | | | | [ci skip] Fix some rulesFilipa Lacerda2018-01-048-135/+156
| | * | | | | Merge branch 'master' into 34312-eslint-vue-pluginFilipa Lacerda2018-01-04107-340/+2177
| | |\ \ \ \ \
| | * | | | | | Move dependencies to dev dependenciesFilipa Lacerda2018-01-042-9/+9
| | * | | | | | Adds `eslint-plugin-vue`, fixes linter errors and adds docsFilipa Lacerda2018-01-0333-226/+333
| * | | | | | | Merge branch 'remove-beta-notice-for-clusters' into 'master'Achilleas Pipinellis2018-01-101-3/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Remove Beta notice for ClustersFabio Busatto2018-01-101-3/+0
| |/ / / / / / /
| * | | | | | | 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
| | |/ / / / / / /
| * | | | | | | | Merge branch 'zj-migrate-gitlab-project-rm-mv' into 'master'Douwe Maan2018-01-104-90/+41
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Migrate GitlabProject (re)move project endpointsZeger-Jan van de Weg2018-01-094-90/+41
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'fix/use-mirror-refmaps-instead-mirror-refmap' into 'master'Sean McGivern2018-01-104-7/+9
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add support for multiple refmaps to RemoteService#add_remotefix/use-mirror-refmaps-instead-mirror-refmapAhmad Sherif2018-01-094-7/+9
| * | | | | | | | | Merge branch 'dispatcher-dashboard-milestone-show' into 'master'Phil Hughes2018-01-102-1/+12
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Refactor dashboard milestone show inside dispatcherClement Ho2018-01-102-1/+12
| |/ / / / / / / / /
View Lorry Controller Status