summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * 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
| |\ \
| * \ \ 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
| |\ \ \ \
| | * | | | Rendering of emoji's in Group-OverviewJacopo2017-12-246-3/+44
| * | | | | Merge branch 'remove-commit-tree' into 'master'Sean McGivern2018-01-086-9/+10
| |\ \ \ \ \
| | * | | | | Remove the Commit#tree methodremove-commit-treeJacob Vosmaer2018-01-046-9/+10
| * | | | | | Merge branch '38056-remove-unused-option' into 'master'Phil Hughes2018-01-083-4/+0
| |\ \ \ \ \ \
| | * | | | | | Remove unused push_code_to_protected_branches38056-remove-unused-optionLin Jen-Shin2018-01-053-4/+0
| * | | | | | | Merge branch 'gitaly-fetch-internal-remote' into 'master'Sean McGivern2018-01-085-30/+66
| |\ \ \ \ \ \ \
| | * | | | | | | Incorporate RemoteService.FetchInternalRemote Gitaly RPCgitaly-fetch-internal-remoteAlejandro Rodríguez2018-01-055-30/+66
| * | | | | | | | Merge branch 'mb-invites-feature-to-rspec' into 'master'Rémy Coutable2018-01-083-125/+97
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Move invites spinach test to RspecSemyon Pupkov2017-12-253-125/+97
| * | | | | | | | | Merge branch 'mv-explore-groups-spinach-to-rspec' into 'master'Rémy Coutable2018-01-083-193/+87
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Move explore groups spinach test to RSpecSemyon Pupkov2017-12-253-193/+87
| | |/ / / / / / / /
| * | | | | | | | | Merge branch '38030-add-graph-value-to-hover' into 'master'Tim Zallmann2018-01-089-356/+364
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Resolve "Add graph value to hover"Mike Greiling2018-01-089-356/+364
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'issue-40190' into 'master'Phil Hughes2018-01-083-3/+20
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix slash commands dropdown descriptionMaurizio De Santis2018-01-083-3/+20
| |/ / / / / / / / /
View Lorry Controller Status