summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into move-markdown-previewmove-markdown-previewClement Ho2018-01-081311-10016/+25012
|\
| * Merge branch 'winh-webpack-concatenated-module' into 'master'Jacob Schatz2018-01-081-5/+25
| |\
| | * Fix Webpack config for ConcatenatedModulewinh-webpack-concatenated-moduleWinnie Hellmann2018-01-041-5/+25
| * | Merge branch 'fix/remove-unnecessary-dashboard-scroll' into 'master'Annabel Dunstone Gray2018-01-081-4/+0
| |\ \
| | * | Remove unnecessary dashboard scrollGeorge Tsiolis2018-01-041-4/+0
| * | | Merge branch '41744-substitute-ui-charcoal-with-ui-indigo' into 'master'Annabel Dunstone Gray2018-01-084-3/+8
| |\ \ \
| | * | | Substitute deprecated ui_charcoal with new default ui_indigoTakuya Noguchi2018-01-074-3/+8
| * | | | Merge branch 'workhorse-3.4.0' into 'master'Sean McGivern2018-01-081-1/+1
| |\ \ \ \
| | * | | | Use workhorse 3.4.0workhorse-3.4.0Jacob Vosmaer2018-01-081-1/+1
| * | | | | Merge branch 'master' into 'master'Rémy Coutable2018-01-081-3/+7
| |\ \ \ \ \
| | * | | | | Add Gitter room link to I want to contribute since you always have questionsJosh Unger2018-01-081-3/+7
| |/ / / / /
| * | | | | Merge branch '28260-fix-pages-custom-domain-url' into 'master'Grzegorz Bizon2018-01-083-2/+7
| |\ \ \ \ \
| | * | | | | Generate HTTP URLs for custom Pages domains when appropriateNick Thomas2018-01-083-2/+7
| * | | | | | Merge branch 'rs-update-rack-cors' into 'master'Nick Thomas2018-01-082-4/+4
| |\ \ \ \ \ \
| | * | | | | | Update rack-cors from 0.4.0 to 1.0.2Robert Speicher2018-01-022-4/+4
| * | | | | | | Merge branch 'docs/typo-writing-documentation' into 'master'Robert Speicher2018-01-081-2/+2
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | chore: remove symbolic linkOnuwa Nnachi Isaac2018-01-081-1/+0
| | * | | | | | Fix typo in writing_documentation.mdOnuwa Nnachi Isaac2018-01-022-2/+3
| * | | | | | | Merge branch '40418-migrate-existing-data-from-kubernetesservice-to-clusters-...Yorick Peterse2018-01-083-0/+468
| |\ \ \ \ \ \ \
| | * | | | | | | Add memoization for properties40418-migrate-existing-data-from-kubernetesservice-to-clusters-platforms-kubernetesShinya Maeda2018-01-081-4/+10
| | * | | | | | | Fix static analysysShinya Maeda2018-01-081-9/+9
| | * | | | | | | Disable STI of ActiveRecord. Refactoring specs.Shinya Maeda2018-01-082-66/+184
| | * | | | | | | Fix StaticSnalysysShinya Maeda2018-01-081-1/+1
| | * | | | | | | Fix change logShinya Maeda2018-01-081-1/+1
| | * | | | | | | Add changelogShinya Maeda2018-01-081-0/+5
| | * | | | | | | Revert bulk_insert and bring back AR insert(one by one)Shinya Maeda2018-01-082-64/+54
| | * | | | | | | Add a new test for emptified paramsShinya Maeda2018-01-081-2/+19
| | * | | | | | | Use batch update for Service deactivationShinya Maeda2018-01-081-4/+5
| | * | | | | | | Fix query to look for proper unmanaged kubernetes serviceShinya Maeda2018-01-081-17/+12
| | * | | | | | | Fix static anylysyShinya Maeda2018-01-082-9/+10
| | * | | | | | | Use bulk_insert instead of AR createShinya Maeda2018-01-081-12/+45
| | * | | | | | | Opitmize migration process by using both unmanaged_kubernetes_service and kub...Shinya Maeda2018-01-082-40/+36
| | * | | | | | | Avoid quotes in ActiveRecord queryShinya Maeda2018-01-081-4/+4
| | * | | | | | | Use explicit namespace for avoiding reference from application codeShinya Maeda2018-01-081-13/+16
| | * | | | | | | Add logic to swtich environment_scope by the situationShinya Maeda2018-01-082-33/+69
| | * | | | | | | Add env_scope testsShinya Maeda2018-01-082-0/+33
| | * | | | | | | Fix testShinya Maeda2018-01-081-187/+52
| | * | | | | | | Fix commentsShinya Maeda2018-01-081-10/+10
| | * | | | | | | Restructure specShinya Maeda2018-01-081-160/+229
| | * | | | | | | Fix migration file typos and reorder Table definitionShinya Maeda2018-01-081-25/+21
| | * | | | | | | Fix unmanaged_kubernetes_service scope for multiple clustersShinya Maeda2018-01-081-17/+27
| | * | | | | | | Add test. Disable KubernetesService when migratedShinya Maeda2018-01-082-11/+201
| | * | | | | | | Migrate existing data from KubernetesService to Clusters::Platforms::KubernetesShinya Maeda2018-01-081-0/+104
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch '41754-update-scss-lint-to-0-56-0' into 'master'Rémy Coutable2018-01-083-5/+17
| |\ \ \ \ \ \ \
| | * | | | | | | Update scss-lint to 0.56.0Takuya Noguchi2018-01-083-5/+17
| | |/ / / / / /
| * | | | | | | Merge branch 'delay-background-migrations' into 'master'Rémy Coutable2018-01-088-11/+110
| |\ \ \ \ \ \ \
| | * | | | | | | Run background migrations with a minimum intervaldelay-background-migrationsYorick Peterse2018-01-058-11/+110
| * | | | | | | | Merge branch '149-qa-honor-chrome-headless-false' into 'master'Grzegorz Bizon2018-01-084-7/+114
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Resolve "Allow QA tests to run with `CHROME_HEADLESS=false`"Brett Walker2018-01-084-7/+114
| |/ / / / / / / /
| * | | | | | | | Merge branch '40549-render-emoj-in-groups-overview' into 'master'Sean McGivern2018-01-086-3/+44
| |\ \ \ \ \ \ \ \
View Lorry Controller Status