summaryrefslogtreecommitdiff
path: root/db
Commit message (Expand)AuthorAgeFilesLines
* Fix db/schema.rbKamil Trzcinski2017-11-071-2/+1
* Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Kamil Trzcinski2017-11-071-1/+1
|\
| * Fix schema versionShinya Maeda2017-11-081-1/+1
* | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsKamil Trzcinski2017-11-073-0/+58
|\ \ | |/
| * Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-073-0/+58
| |\
| | * Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master'Rémy Coutable2017-11-073-0/+58
| | |\
| | | * Support custom attributes on groupsMarkus Koller2017-11-062-0/+31
| | | * Support custom attributes on projectsMarkus Koller2017-11-062-0/+27
* | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsEric Eastwood2017-11-062-1/+14
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' into 38464-k8s-appsEric Eastwood2017-11-062-2/+15
| |\ \ \ | | |/ /
| | * | Merge branch 'refactor-clusters' into 'master'Grzegorz Bizon2017-11-063-0/+229
| | |\ \
| | * \ \ Merge branch 'remove-ensure-ref-fetched-from-controllers' into 'master'Sean McGivern2017-11-062-2/+15
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | make the migration reversiblemicael.bergeron2017-11-031-1/+1
| | | * | add changelog and move migration to post_migratemicael.bergeron2017-11-031-0/+0
| | | * | removed the #ensure_ref_fetched from all controllersmicael.bergeron2017-11-032-2/+15
* | | | | Fix db/schema.rbKamil Trzcinski2017-11-061-1/+10
* | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsEric Eastwood2017-11-061-9/+3
|\ \ \ \ \ | |/ / / /
| * | | | db/schema.rb cleanupAlessio Caiazza2017-11-061-9/+3
| * | | | Merge branch 'refactor-clusters' into 38464-k8s-appsAlessio Caiazza2017-11-063-87/+104
| |\ \ \ \ | | | |_|/ | | |/| |
* | | | | Add ingress applicationKamil Trzcinski2017-11-062-11/+35
* | | | | Merge remote-tracking branch 'origin/refactor-clusters' into 36629-35958-add-...Kamil Trzcinski2017-11-063-87/+104
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Fix statis analysysShinya Maeda2017-11-051-1/+1
| * | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-051-1/+5
| |\ \ \ | | |/ /
| | * | Put a condition to old migration that adds fast_forward column to MRsValery Sizov2017-11-041-1/+5
| | |/
| * | Move migration file to post-migration. Use EachBatch. batch_size 1Shinya Maeda2017-11-042-90/+99
| * | Fix MigrateGcpClustersToNewClustersArchitectures. Improve specShinya Maeda2017-11-031-1/+5
* | | Merge branch 'refactor-clusters' into 38464-k8s-appsAlessio Caiazza2017-11-032-2/+11
|\ \ \ | |/ /
| * | Fix tests. Remove NOT NULL constraint from cluster.user.Shinya Maeda2017-11-032-2/+2
| * | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-035-3/+155
| |\ \ | | |/
| * | Fix out of sync with KubernetesService. Remove namespace pramas from controll...Shinya Maeda2017-11-021-6/+6
* | | Merge remote-tracking branch 'origin/master' into 38464-k8s-appsKamil Trzcinski2017-11-035-2/+154
|\ \ \ | | |/ | |/|
| * | Merge branch '37631-add-a-merge_request_diff_id-column-to-merge_requests' int...Yorick Peterse2017-11-023-1/+57
| |\ \
| | * | Add a column linking an MR to its diffSean McGivern2017-11-023-1/+57
| * | | Remove user authentication_token columnDouwe Maan2017-11-022-2/+20
| * | | Migrate user private tokens to personal access tokensDouwe Maan2017-11-021-0/+78
| |/ /
* | | Fix rubocop offensesAlessio Caiazza2017-11-021-1/+1
* | | General cleanupAlessio Caiazza2017-11-021-0/+4
* | | Improve backend structure of dataKamil Trzcinski2017-11-022-18/+25
* | | Merge branch 'refactor-clusters' into 38464-k8s-appsKamil Trzcinski2017-11-026-12/+266
|\ \ \ | | |/ | |/|
| * | Revert back FetchKubernetesTokenServiceKamil Trzcinski2017-11-012-4/+4
| * | Slim down Platforms::Kubernetes, and instead make it instrument KubernetesSer...Kamil Trzcinski2017-11-011-2/+2
| * | Improve migration file. Add migration spec. Reorder columns of the table.Shinya Maeda2017-11-014-105/+112
| * | Fix spec. Fix usage ping. Fix warnings by adding new models and attributes.Shinya Maeda2017-11-011-1/+1
| * | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-013-12/+19
| |\ \ | | |/
| | * Merge branch 'bvl-dont-rename-free-names' into 'master'Douwe Maan2017-10-241-11/+0
| | |\
| | | * Don't rename groups/projects that aren't reserved anymorebvl-dont-rename-free-namesBob Van Landuyt2017-10-241-11/+0
| | * | Add new circuitbreaker properties to application_settingsBob Van Landuyt2017-10-232-1/+19
| | |/
| * | This worksShinya Maeda2017-10-233-10/+153
| * | Refactor Clusters to be consisted from GcpProvider and KubernetesPlatformKamil Trzcinski2017-10-231-0/+66
| |/
| * Add existing circuitbreaker settings to the databaseBob Van Landuyt2017-10-172-1/+32
View Lorry Controller Status