summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix TRIGGER checks for MySQLfix-mysql-grant-checkYorick Peterse2017-11-063-28/+29
* Merge branch 'refactor-clusters' into 'master'Grzegorz Bizon2017-11-0671-1240/+2676
|\
| * Remove 10.3 comments (Tracked by a tech debts issue). Refactor spec factory n...refactor-clustersShinya Maeda2017-11-0616-207/+37
| * Merge branch 'master' into refactor-clustersShinya Maeda2017-11-0619-91/+303
| |\
| * | Fix statis analysysShinya Maeda2017-11-051-1/+1
| * | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-05241-1260/+1888
| |\ \
| * | | Move migration file to post-migration. Use EachBatch. batch_size 1Shinya Maeda2017-11-043-103/+102
| * | | Fix MigrateGcpClustersToNewClustersArchitectures. Improve specShinya Maeda2017-11-032-77/+169
| * | | Fix import_export failureShinya Maeda2017-11-031-3/+4
| * | | Fix spec failure. MySQL does not bite trueShinya Maeda2017-11-033-2/+7
| * | | Merge branch 'master' into refactor-clustersEric Eastwood2017-11-0313-34/+85
| |\ \ \
| * | | | Fix tests. Remove NOT NULL constraint from cluster.user.Shinya Maeda2017-11-036-8/+16
| * | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-03252-1867/+2376
| |\ \ \ \
| * | | | | Fix some testsShinya Maeda2017-11-039-288/+185
| * | | | | Fix out of sync with KubernetesService. Remove namespace pramas from controll...Shinya Maeda2017-11-027-71/+34
| * | | | | Merge branch 'refactor-clusters' of https://gitlab.com/gitlab-org/gitlab-ce i...Shinya Maeda2017-11-021-1/+1
| |\ \ \ \ \
| | * | | | | Pass cluster_idKamil Trzcinski2017-11-011-1/+1
| * | | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-02203-1987/+1962
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Revert back FetchKubernetesTokenServiceKamil Trzcinski2017-11-019-42/+156
| * | | | | | Slim down Platforms::Kubernetes, and instead make it instrument KubernetesSer...Kamil Trzcinski2017-11-014-128/+43
| * | | | | | Improve migration file. Add migration spec. Reorder columns of the table.Shinya Maeda2017-11-015-105/+200
| * | | | | | Fix spec. Fix usage ping. Fix warnings by adding new models and attributes.Shinya Maeda2017-11-0112-48/+102
| * | | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-01635-6793/+11717
| |\ \ \ \ \ \
| * | | | | | | specs for featureShinya Maeda2017-11-0110-94/+165
| * | | | | | | specs for controller. Improved validationShinya Maeda2017-10-3111-251/+446
| * | | | | | | spec for spec/presentersShinya Maeda2017-10-311-6/+5
| * | | | | | | specs for serializers.Shinya Maeda2017-10-312-18/+39
| * | | | | | | specs for policies.Shinya Maeda2017-10-311-3/+3
| * | | | | | | specs for workers.Shinya Maeda2017-10-314-55/+33
| * | | | | | | specs for services. Improved details.Shinya Maeda2017-10-3021-388/+653
| * | | | | | | specs for models. Improved details.Shinya Maeda2017-10-3016-342/+838
| * | | | | | | This worksShinya Maeda2017-10-2324-219/+422
| * | | | | | | Refactor Clusters to be consisted from GcpProvider and KubernetesPlatformKamil Trzcinski2017-10-2322-357/+592
* | | | | | | | Merge branch 'pawel/metrics-to-prometheus-33643' into 'master'Grzegorz Bizon2017-11-0640-553/+1000
|\ \ \ \ \ \ \ \
| * | | | | | | | Add missing mutex guard to method call metricspawel/metrics-to-prometheus-33643Pawel Chojnacki2017-11-031-12/+21
| * | | | | | | | Only enable unicorn metrics when not in sidekiq mode.Pawel Chojnacki2017-11-022-5/+4
| * | | | | | | | Make subscriber tests pass, after refactoring metricsPawel Chojnacki2017-11-026-11/+11
| * | | | | | | | Use Mutex to guard metrics creation in transaction. Switch action view to thr...Pawel Chojnacki2017-11-022-28/+49
| * | | | | | | | move metrics for ActiveRecord, RailsCache and queue duration to instance vari...Pawel Chojnacki2017-11-023-38/+40
| * | | | | | | | rename BackgroundMigration to SidekiqMigrationPawel Chojnacki2017-11-026-4/+17
| * | | | | | | | Fix sidekiq middleware testsPawel Chojnacki2017-11-025-27/+14
| * | | | | | | | Remove unnecessary namespace usePawel Chojnacki2017-11-022-7/+7
| * | | | | | | | Tests for Web transaction and remove simple transactonPawel Chojnacki2017-11-0211-272/+41
| * | | | | | | | Web/Sidekiq transaction splitPawel Chojnacki2017-11-023-1/+262
| * | | | | | | | Move labels to be initialized in constructorPawel Chojnacki2017-11-021-5/+2
| * | | | | | | | Avoid using Send (but is it better?) + small rubocop cleanupPawel Chojnacki2017-11-022-10/+8
| * | | | | | | | Cleanup metrics names and removing unnecessary cache read totalPawel Chojnacki2017-11-022-30/+8
| * | | | | | | | Adjust test to changed metrics methods.Pawel Chojnacki2017-11-023-18/+4
| * | | | | | | | Convert rails_queue_duration to metric_rails_queue_duration_secondsPawel Chojnacki2017-11-022-2/+23
| * | | | | | | | Add info about prometheus bucketsPawel Chojnacki2017-11-022-7/+9