From 89eff770d213e684b5fa4df121cb51a059e8d263 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 18 Aug 2020 09:10:05 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../components/charts/time_series.vue | 3 +- .../ci_configuration/sast_resolver.rb | 17 ---- .../resolvers/project_pipeline_resolver.rb | 2 +- .../types/ci/pipeline_config_source_enum.rb | 11 +++ app/graphql/types/ci/pipeline_type.rb | 2 + .../sast/analyzers_entity_type.rb | 25 ------ .../ci_configuration/sast/entity_type.rb | 34 ------- .../sast/options_entity_type.rb | 19 ---- .../types/ci_configuration/sast/type.rb | 22 ----- app/graphql/types/project_type.rb | 4 - .../sast_ui_schema.json | 80 +++++------------ ...-remove-constraint-on-audit-event-type.yml | 5 ++ ...ll-pipeline-in-graphql-response-224687.yml | 5 ++ ...ll_constraint_on_type_from_audit_events.rb | 27 ++++++ db/schema_migrations/20200811055018 | 1 + db/structure.sql | 4 +- .../graphql/reference/gitlab_schema.graphql | 18 ++++ doc/api/graphql/reference/gitlab_schema.json | 73 +++++++++++++++ doc/api/graphql/reference/index.md | 1 + lib/gitlab/usage_data.rb | 4 + .../distinct_count_by_large_foreign_key.rb | 43 +++++++++ rubocop/rubocop-usage-data.yml | 13 +++ .../ci_configuration/sast_resolver_spec.rb | 28 ------ .../project_pipeline_resolver_spec.rb | 17 ++++ .../sast/analyzers_entity_type_spec.rb | 11 --- .../ci_configuration/sast/entity_type_spec.rb | 11 --- .../sast/options_entity_spec.rb | 11 --- .../types/ci_configuration/sast/type_spec.rb | 11 --- spec/graphql/types/project_type_spec.rb | 90 +------------------ spec/models/audit_event_partitioned_spec.rb | 16 ++++ .../api/graphql/project/pipeline_spec.rb | 6 ++ ...istinct_count_by_large_foreign_key_spec.rb | 38 ++++++++ .../gitlab_stubs/gitlab_ci_for_sast.yml | 13 +++ .../read_ci_configuration_shared_context.rb | 9 ++ 34 files changed, 327 insertions(+), 347 deletions(-) delete mode 100644 app/graphql/resolvers/ci_configuration/sast_resolver.rb create mode 100644 app/graphql/types/ci/pipeline_config_source_enum.rb delete mode 100644 app/graphql/types/ci_configuration/sast/analyzers_entity_type.rb delete mode 100644 app/graphql/types/ci_configuration/sast/entity_type.rb delete mode 100644 app/graphql/types/ci_configuration/sast/options_entity_type.rb delete mode 100644 app/graphql/types/ci_configuration/sast/type.rb create mode 100644 changelogs/unreleased/229914-remove-constraint-on-audit-event-type.yml create mode 100644 changelogs/unreleased/null-pipeline-in-graphql-response-224687.yml create mode 100644 db/migrate/20200811055018_remove_not_null_constraint_on_type_from_audit_events.rb create mode 100644 db/schema_migrations/20200811055018 create mode 100644 rubocop/cop/usage_data/distinct_count_by_large_foreign_key.rb delete mode 100644 spec/graphql/resolvers/ci_configuration/sast_resolver_spec.rb delete mode 100644 spec/graphql/types/ci_configuration/sast/analyzers_entity_type_spec.rb delete mode 100644 spec/graphql/types/ci_configuration/sast/entity_type_spec.rb delete mode 100644 spec/graphql/types/ci_configuration/sast/options_entity_spec.rb delete mode 100644 spec/graphql/types/ci_configuration/sast/type_spec.rb create mode 100644 spec/rubocop/cop/usage_data/distinct_count_by_large_foreign_key_spec.rb create mode 100644 spec/support/gitlab_stubs/gitlab_ci_for_sast.yml create mode 100644 spec/support/shared_contexts/read_ci_configuration_shared_context.rb diff --git a/app/assets/javascripts/monitoring/components/charts/time_series.vue b/app/assets/javascripts/monitoring/components/charts/time_series.vue index e7cd612409f..054111c203e 100644 --- a/app/assets/javascripts/monitoring/components/charts/time_series.vue +++ b/app/assets/javascripts/monitoring/components/charts/time_series.vue @@ -1,6 +1,6 @@