4 commits

Author	SHA1	Message	Date
GitLab Bot	33813f993b	Add latest changes from gitlab-org/gitlab@master	2019-10-24 12:06:03 +00:00
GitLab Bot	e464f195ff	Add latest changes from gitlab-org/gitlab@master	2019-10-14 12:06:14 +00:00
Stan Hu	fddff2c411	Fix Arel deprecation warning in clusters_hierarchy ... As mentioned in https://github.com/rails/rails/pull/29619, this removes this warning message: ``` Delegating join_sources to arel is deprecated and will be removed in Rails 6.0. (called from project_clusters_base_query at app/models/clusters/clusters_hierarchy.rb:62) ``` Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/61451	2019-08-16 09:59:25 -07:00
Thong Kuah	3bc76511a0	Create CTE query for clusters hierarchy ... - This enables us to use a scope to query all clusters in group hierarchy order in one query, and also enables us to union to instance clusters later. - Handle case where clusters not present at level. In which case the query should go ahead and return the next level's clusters. - Swap with new CTE query behind Feature flag. This FF is default disabled.	2019-07-08 06:03:09 +00:00