From 766b24b86ba1c5405d6a300f35062c33108941d4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 10 Sep 2020 12:08:54 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- GITALY_SERVER_VERSION | 2 +- .../components/invite_members_banner.vue | 10 +- .../groups/init_invite_members_banner.js | 3 +- .../components/edit_area.vue | 2 +- .../services/parse_source_file.js | 93 ++---- .../parse_source_file_language_support.js | 17 - .../stores/mr_widget_store.js | 6 +- .../merge_requests/diffs_controller.rb | 2 +- .../projects/merge_requests_controller.rb | 8 +- .../boards/issues/issue_move_list.rb | 4 +- .../measurements_resolver.rb | 37 +++ .../measurement_identifier_enum.rb | 21 ++ .../instance_statistics/measurement_type.rb | 24 ++ app/graphql/types/query_type.rb | 5 + .../instance_statistics/measurement.rb | 12 +- app/models/merge_request.rb | 13 + ...merge_request_poll_cached_widget_entity.rb | 10 +- app/views/admin/services/_form.html.haml | 2 +- app/views/groups/show.html.haml | 1 + ...on-external-wiki-service-template-form.yml | 5 + ...expose-instance-statistics-via-graphql.yml | 5 + .../244848-skip-cleanup-for-forks.yml | 5 + ...merged-commit-sha-in-fast-forward-mode.yml | 5 + .../ensure-db-consistency-after-36321.yml | 5 + .../development/usage_data_api.yml | 7 + ...0_complete_namespace_settings_migration.rb | 35 +++ db/schema_migrations/20200907124300 | 1 + doc/.vale/gitlab/spelling-exceptions.txt | 1 + doc/api/boards.md | 2 +- .../graphql/reference/gitlab_schema.graphql | 124 +++++++- doc/api/graphql/reference/gitlab_schema.json | 293 +++++++++++++++++- doc/api/graphql/reference/index.md | 10 + doc/api/issues.md | 6 +- doc/development/feature_flags/development.md | 2 +- doc/development/telemetry/usage_ping.md | 22 ++ ...unning_tests_that_require_special_setup.md | 146 ++++++++- doc/raketasks/cleanup.md | 4 + .../img/delete_value_stream_v13.4.png | Bin 0 -> 29439 bytes doc/user/analytics/value_stream_analytics.md | 13 + .../configuration/index.md | 12 +- doc/user/project/issue_board.md | 174 +++++------ doc/user/project/issues/design_management.md | 40 +++ .../issues/img/design_todo_button_v13_4.png | Bin 0 -> 166635 bytes .../project/issues/sorting_issue_lists.md | 4 +- lib/api/api.rb | 1 + lib/api/usage_data.rb | 29 ++ .../cleanup/orphan_lfs_file_references.rb | 8 + lib/gitlab/danger/helper.rb | 5 +- lib/gitlab/logger.rb | 3 +- .../issue_and_merge_request_actions.rb | 2 + locale/gitlab.pot | 15 + package.json | 1 + .../instance_statistics/measurement.rb | 10 +- .../user_accepts_merge_request_spec.rb | 34 +- .../merge_request_poll_cached_widget.json | 6 +- .../components/invite_members_banner_spec.js | 60 ++-- .../components/edit_area_spec.js | 2 +- spec/frontend/static_site_editor/mock_data.js | 25 +- ...parse_source_file_language_support_spec.js | 20 -- .../services/parse_source_file_spec.js | 30 +- .../measurements_resolver_spec.rb | 47 +++ .../measurement_identifier_enum_spec.rb | 13 + .../measurement_type_spec.rb | 11 + spec/graphql/types/query_type_spec.rb | 9 + .../orphan_lfs_file_references_spec.rb | 40 +++ spec/lib/gitlab/danger/helper_spec.rb | 24 ++ ...plete_namespace_settings_migration_spec.rb | 24 ++ .../instance_statistics/measurement_spec.rb | 31 ++ spec/models/application_record_spec.rb | 76 ++--- spec/models/merge_request_spec.rb | 54 ++++ .../instance_statistics_measurements_spec.rb | 21 ++ spec/requests/api/usage_data_spec.rb | 67 ++++ .../notes/quick_actions_service_spec.rb | 117 +++++-- yarn.lock | 25 +- 74 files changed, 1639 insertions(+), 364 deletions(-) delete mode 100644 app/assets/javascripts/static_site_editor/services/parse_source_file_language_support.js create mode 100644 app/graphql/resolvers/admin/analytics/instance_statistics/measurements_resolver.rb create mode 100644 app/graphql/types/admin/analytics/instance_statistics/measurement_identifier_enum.rb create mode 100644 app/graphql/types/admin/analytics/instance_statistics/measurement_type.rb create mode 100644 changelogs/unreleased/20748-fix-validation-on-external-wiki-service-template-form.yml create mode 100644 changelogs/unreleased/241673-expose-instance-statistics-via-graphql.yml create mode 100644 changelogs/unreleased/244848-skip-cleanup-for-forks.yml create mode 100644 changelogs/unreleased/display-merged-commit-sha-in-fast-forward-mode.yml create mode 100644 changelogs/unreleased/ensure-db-consistency-after-36321.yml create mode 100644 config/feature_flags/development/usage_data_api.yml create mode 100644 db/post_migrate/20200907124300_complete_namespace_settings_migration.rb create mode 100644 db/schema_migrations/20200907124300 create mode 100644 doc/user/analytics/img/delete_value_stream_v13.4.png create mode 100644 doc/user/project/issues/img/design_todo_button_v13_4.png create mode 100644 lib/api/usage_data.rb delete mode 100644 spec/frontend/static_site_editor/services/parse_source_file_language_support_spec.js create mode 100644 spec/graphql/resolvers/admin/analytics/instance_statistics/measurements_resolver_spec.rb create mode 100644 spec/graphql/types/admin/analytics/instance_statistics/measurement_identifier_enum_spec.rb create mode 100644 spec/graphql/types/admin/analytics/instance_statistics/measurement_type_spec.rb create mode 100644 spec/migrations/complete_namespace_settings_migration_spec.rb create mode 100644 spec/requests/api/graphql/instance_statistics_measurements_spec.rb create mode 100644 spec/requests/api/usage_data_spec.rb diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 02fe0a51d0b..a1f2210c5ce 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -47f676eea28871563414671e1016fb28b1b3e167 +d2e978f8e8f47a49c3bcfbd470b2f790e52c5ee2 diff --git a/app/assets/javascripts/groups/components/invite_members_banner.vue b/app/assets/javascripts/groups/components/invite_members_banner.vue index 83a23134279..a2d18229c8b 100644 --- a/app/assets/javascripts/groups/components/invite_members_banner.vue +++ b/app/assets/javascripts/groups/components/invite_members_banner.vue @@ -1,20 +1,22 @@