summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 10.4.0-rc5v10.4.0-rc5Luke Bennett2018-01-151-1/+1
* Merge branch '10-4-security-patch-rebased' into '10-4-stable'LUKE BENNETT2018-01-1593-277/+1217
|\
| * Make ruby lint happyOswaldo Ferreira2018-01-151-2/+2
| * Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3'Robert Speicher2018-01-158-13/+118
| * Merge branch 'fl-ipythin-10-3' into 'security-10-3'Phil Hughes2018-01-157-4/+176
| * Merge branch 'fix/import-rce-10-3' into 'security-10-3'James Lopez2018-01-155-16/+68
| * Merge branch '41293-fix-command-injection-vulnerability-on-system_hook_push-q...Robert Speicher2018-01-155-1/+28
| * Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'securit...Douwe Maan2018-01-1533-141/+383
| * Merge branch '41567-projectfix' into 'security-10-3'Sean McGivern2018-01-158-20/+133
| * Merge branch 'ac/fix-path-traversal' into 'security-10-3'Robert Speicher2018-01-154-2/+83
| * Merge branch 'sh-validate-path-project-import-10-3' into 'security-10-3'Stan Hu2018-01-154-2/+71
| * Merge branch 'milestones-finder-order-fix' into 'security-10-3'Robert Speicher2018-01-157-54/+43
| * Merge branch 'label-xss-10-3' into 'security-10-3'Jacob Schatz2018-01-152-1/+10
| * Merge branch 'ac/41346-xss-ci-job-output' into 'security-10-3'Robert Speicher2018-01-152-5/+52
| * Merge branch 'security-10-3-do-not-expose-passwords-or-tokens-in-service-inte...Stan Hu2018-01-159-18/+52
|/
* Update VERSION to 10.4.0-rc4v10.4.0-rc4Robert Speicher2018-01-121-1/+1
* Merge branch '10-4-stable-prepare-rc4' into '10-4-stable'Marin Jankovski2018-01-1215-47/+603
|\
| * Merge branch 'gcp-fix' into 'master'10-4-stable-prepare-rc4Kamil Trzciński2018-01-1112-47/+135
| * Merge branch '40418-migrate-existing-data-from-kubernetesservice-to-clusters-...Yorick Peterse2018-01-113-0/+468
|/
* Update VERSION to 10.4.0-rc3v10.4.0-rc3Luke Bennett2018-01-111-1/+1
* Merge branch '10-4-stable-prepare-rc3' into '10-4-stable'Marin Jankovski2018-01-11228-2716/+12396
|\
| * Merge branch '10-4-stable-prepare-rc3-with-missing-commits' into '10-4-stable...Marin Jankovski2018-01-1150-748/+892
| |\
| | * Merge branch '10-4-stable-prepare-rc3-with-missing-commits' of https://gitlab...10-4-stable-prepare-rc3-with-missing-commitsLuke Bennett2018-01-111-170/+0
| | |\
| | | * Delete fast_ssh_key_lookup.mdLuke Bennett2018-01-111-170/+0
| | * | Revert "Merge branch '40418-migrate-existing-data-from-kubernetesservice-to-c...Luke Bennett2018-01-113-468/+0
| | |/
| | * Merge branch '10-4-stable-missing-commits' into 10-4-stable-prepare-rc3-with-...Luke Bennett2018-01-1053-748/+1360
| | |\
| | | * 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
View Lorry Controller Status