summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix indention and bad conflict mergeprojects-a-refactorClement Ho2018-01-101-7/+6
* Merge branch 'master' into 'projects-a-refactor'Clement Ho2018-01-10284-5542/+7362
|\
| * Merge branch 'da-verify-integrity-of-uploaded-files' into 'master'Robert Speicher2018-01-104-0/+109
| |\
| | * Add docs for ENV variables take gitlab:uploads:check rake task supportsda-verify-integrity-of-uploaded-filesDouglas Barbosa Alexandre2018-01-091-0/+13
| | * Fix small typosDouglas Barbosa Alexandre2018-01-092-4/+4
| | * Refactoring spec for the gitlab:uploads:check rake taskDouglas Barbosa Alexandre2018-01-081-6/+5
| | * Make Rubocop happyDouglas Barbosa Alexandre2018-01-081-1/+1
| | * Add docs for the gitlab:uploads:check rake taskDouglas Barbosa Alexandre2018-01-081-0/+20
| | * Add CHANGELOGDouglas Barbosa Alexandre2018-01-081-0/+5
| | * Add spec for gitlab:uploads rake tasksDouglas Barbosa Alexandre2018-01-081-0/+28
| | * Add rake task to check integrity of uploaded filesDouglas Barbosa Alexandre2018-01-081-0/+44
| * | Merge branch 'merge-request-lfs-badge' into 'master'Douwe Maan2018-01-101-0/+3
| |\ \
| | * | Removed CHANGELOG entryPhil Hughes2018-01-101-5/+0
| | * | Added LFS to merge request files tracked by LFSmerge-request-lfs-badgePhil Hughes2018-01-102-0/+8
| * | | 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
| |/ / / / / / / /
View Lorry Controller Status