-
- Downloads
Merge branch 'ce-to-ee-2018-10-29' into 'master'
CE upstream - 2018-10-29 11:21 UTC Closes #7760 See merge request gitlab-org/gitlab-ee!8131
No related branches found
No related tags found
Pipeline #34772432 passed with warnings
Stage: build
Stage: prepare
Stage: test
Stage: post-test
Stage: pages
Stage: post-cleanup
Stage: deploy
Showing
- app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js 6 additions, 1 deletion...ts/filtered_search/issuable_filtered_search_token_keys.js
- app/controllers/dashboard/milestones_controller.rb 6 additions, 1 deletionapp/controllers/dashboard/milestones_controller.rb
- app/controllers/groups/milestones_controller.rb 1 addition, 1 deletionapp/controllers/groups/milestones_controller.rb
- app/models/clusters/cluster.rb 28 additions, 0 deletionsapp/models/clusters/cluster.rb
- app/models/clusters/group.rb 10 additions, 0 deletionsapp/models/clusters/group.rb
- app/models/concerns/deployment_platform.rb 1 addition, 0 deletionsapp/models/concerns/deployment_platform.rb
- app/models/global_milestone.rb 0 additions, 44 deletionsapp/models/global_milestone.rb
- app/models/group.rb 3 additions, 0 deletionsapp/models/group.rb
- app/models/milestone.rb 16 additions, 0 deletionsapp/models/milestone.rb
- app/services/clusters/create_service.rb 2 additions, 2 deletionsapp/services/clusters/create_service.rb
- app/views/shared/issuable/_search_bar.html.haml 5 additions, 2 deletionsapp/views/shared/issuable/_search_bar.html.haml
- changelogs/unreleased/34758-create-group-clusters.yml 5 additions, 0 deletionschangelogs/unreleased/34758-create-group-clusters.yml
- changelogs/unreleased/52383-ui-filter-assignee-none-any.yml 5 additions, 0 deletionschangelogs/unreleased/52383-ui-filter-assignee-none-any.yml
- changelogs/unreleased/rz_fix_milestone_count.yml 5 additions, 0 deletionschangelogs/unreleased/rz_fix_milestone_count.yml
- config/routes.rb 1 addition, 0 deletionsconfig/routes.rb
- db/migrate/20181014203236_create_cluster_groups.rb 17 additions, 0 deletionsdb/migrate/20181014203236_create_cluster_groups.rb
- db/migrate/20181017001059_add_cluster_type_to_clusters.rb 18 additions, 0 deletionsdb/migrate/20181017001059_add_cluster_type_to_clusters.rb
- db/schema.rb 11 additions, 0 deletionsdb/schema.rb
- doc/api/tags.md 1 addition, 1 deletiondoc/api/tags.md
- doc/user/project/issue_board.md 2 additions, 2 deletionsdoc/user/project/issue_board.md
app/models/clusters/group.rb
0 → 100644