From 634e9bccc65592100a40849912fe7bb0a52e1b24 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 31 Jan 2022 18:18:10 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_todo.yml | 1 + .rubocop_todo/gitlab/namespaced_class.yml | 1 + .rubocop_todo/rails/save_bang.yml | 13 - GITLAB_PAGES_VERSION | 2 +- .../clusters_list/components/agents.vue | 55 ++- .../components/clusters_view_all.vue | 4 +- .../javascripts/clusters_list/constants.js | 3 + .../components/group_select.vue | 24 +- .../components/invite_members_modal.vue | 5 + .../init_invite_members_modal.js | 1 + .../permissions/components/settings_panel.vue | 2 +- .../secondary_navigation_elements.scss | 5 +- app/assets/stylesheets/pages/clusters.scss | 14 +- .../admin/requests_profiles_controller.rb | 21 ++ .../projects/clusters_controller.rb | 1 + .../projects/commits_controller.rb | 12 +- .../projects/project_members_controller.rb | 3 +- .../settings/repository_controller.rb | 2 +- app/helpers/invite_members_helper.rb | 8 +- app/helpers/nav_helper.rb | 2 +- app/models/project.rb | 8 + app/models/users/callout.rb | 5 +- .../container_scanning_create_service.rb | 25 ++ .../admin/requests_profiles/index.html.haml | 22 ++ .../layouts/nav/sidebar/_admin.html.haml | 4 + app/workers/all_queues.yml | 9 + app/workers/requests_profiles_worker.rb | 18 + .../development/ci_bulk_insert_tags.yml | 2 +- .../ops/show_gitlab_agent_feedback.yml | 8 + config/initializers/1_settings.rb | 3 + config/initializers/request_profiler.rb | 1 + .../20210216182125_user_sast_jobs.yml | 23 -- ...10216182127_user_secret_detection_jobs.yml | 23 -- .../20210216182116_user_sast_jobs.yml | 20 -- ...10216182118_user_secret_detection_jobs.yml | 20 -- config/routes/admin.rb | 1 + ...us-filter-does-accept-active-or-paused.yml | 18 + ...r_registry_enabled_to_project_features3.rb | 1 - ...525075724_clean_up_pending_builds_table.rb | 2 +- ...e_protected_attribute_to_pending_builds.rb | 2 +- .../postgresql/replication_and_failover.md | 7 +- doc/api/graphql/reference/index.md | 25 ++ doc/api/merge_requests.md | 6 +- doc/api/runners.md | 82 +++-- doc/api/usage_data.md | 2 +- doc/ci/cloud_services/aws/index.md | 2 +- doc/ci/pipelines/job_artifacts.md | 3 +- doc/ci/yaml/index.md | 2 +- .../documentation/styleguide/word_list.md | 4 + .../service_ping/metrics_dictionary.md | 2 +- .../service_ping/review_guidelines.md | 2 +- doc/development/snowplow/index.md | 8 +- doc/development/snowplow/review_guidelines.md | 2 +- .../img/object_hierarchy_example_V14_10.png | Bin 0 -> 55849 bytes ...lue_stream_analytics_aggregated_backend.md | 330 ++++++++++++++++++ doc/topics/git/lfs/index.md | 2 +- doc/update/deprecations.md | 18 + .../container_scanning/index.md | 1 + .../coverage_fuzzing/index.md | 5 +- .../terraform_module_registry/index.md | 2 +- lib/api/ci/runners.rb | 13 +- .../backfill_integrations_type_new.rb | 2 +- .../backfill_user_namespace.rb | 2 +- .../primary_key_batching_strategy.rb | 2 +- ...y_column_using_background_migration_job.rb | 2 +- .../delete_orphaned_deployments.rb | 2 +- .../remove_vulnerability_finding_links.rb | 4 +- .../update_timelogs_null_spent_at.rb | 11 +- lib/gitlab/backtrace_cleaner.rb | 1 + lib/gitlab/database/dynamic_model_helpers.rb | 15 +- lib/gitlab/database/migration_helpers.rb | 12 + .../backfill_partitioned_table.rb | 2 +- .../table_management_helpers.rb | 1 - lib/gitlab/profiler.rb | 1 + lib/gitlab/request_profiler.rb | 36 ++ lib/gitlab/request_profiler/middleware.rb | 107 ++++++ lib/gitlab/request_profiler/profile.rb | 43 +++ .../ci_configuration/base_build_action.rb | 1 + .../container_scanning_build_action.rb | 30 ++ locale/gitlab.pot | 38 +- .../maven_gradle_repository_spec.rb | 10 +- .../requests_profiles_controller_spec.rb | 72 ++++ .../projects/commits_controller_spec.rb | 20 ++ .../settings/repository_controller_spec.rb | 14 + .../admin/admin_requests_profiles_spec.rb | 136 ++++++++ .../groups/members/manage_groups_spec.rb | 20 ++ .../projects/members/invite_group_spec.rb | 135 +++---- .../clusters_list/components/agents_spec.js | 82 ++++- .../components/group_select_spec.js | 33 +- .../components/invite_members_modal_spec.js | 2 + .../components/settings_panel_spec.js | 2 +- spec/helpers/invite_members_helper_spec.rb | 27 +- spec/lib/backup/manager_spec.rb | 6 +- .../cycle_analytics/records_fetcher_spec.rb | 14 +- spec/lib/gitlab/auth/ldap/user_spec.rb | 28 +- spec/lib/gitlab/auth/o_auth/user_spec.rb | 74 ++-- spec/lib/gitlab/auth/saml/user_spec.rb | 46 +-- spec/lib/gitlab/auth_spec.rb | 16 +- spec/lib/gitlab/authorized_keys_spec.rb | 2 +- spec/lib/gitlab/backtrace_cleaner_spec.rb | 1 + .../bitbucket_server_import/importer_spec.rb | 4 +- .../database/dynamic_model_helpers_spec.rb | 17 +- .../gitlab/database/migration_helpers_spec.rb | 48 +++ .../project/create_service_spec.rb | 6 +- .../gitlab/request_profiler/profile_spec.rb | 61 ++++ spec/lib/gitlab/request_profiler_spec.rb | 56 +++ .../container_scanning_build_action_spec.rb | 191 ++++++++++ .../sast_build_action_spec.rb | 9 + .../sast_iac_build_action_spec.rb | 4 + .../secret_detection_build_action_spec.rb | 4 + spec/models/project_spec.rb | 23 ++ spec/requests/api/ci/runners_spec.rb | 90 +++-- spec/requests/request_profiler_spec.rb | 56 +++ .../container_scanning_create_service_spec.rb | 19 + 114 files changed, 2114 insertions(+), 438 deletions(-) create mode 100644 app/controllers/admin/requests_profiles_controller.rb create mode 100644 app/services/security/ci_configuration/container_scanning_create_service.rb create mode 100644 app/views/admin/requests_profiles/index.html.haml create mode 100644 app/workers/requests_profiles_worker.rb create mode 100644 config/feature_flags/ops/show_gitlab_agent_feedback.yml delete mode 100644 config/metrics/counts_28d/20210216182125_user_sast_jobs.yml delete mode 100644 config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.yml delete mode 100644 config/metrics/counts_all/20210216182116_user_sast_jobs.yml delete mode 100644 config/metrics/counts_all/20210216182118_user_secret_detection_jobs.yml create mode 100644 data/deprecations/14-8-runner-api-status-filter-does-accept-active-or-paused.yml create mode 100644 doc/development/value_stream_analytics/img/object_hierarchy_example_V14_10.png create mode 100644 doc/development/value_stream_analytics/value_stream_analytics_aggregated_backend.md create mode 100644 lib/gitlab/request_profiler.rb create mode 100644 lib/gitlab/request_profiler/middleware.rb create mode 100644 lib/gitlab/request_profiler/profile.rb create mode 100644 lib/security/ci_configuration/container_scanning_build_action.rb create mode 100644 spec/controllers/admin/requests_profiles_controller_spec.rb create mode 100644 spec/features/admin/admin_requests_profiles_spec.rb create mode 100644 spec/lib/gitlab/request_profiler/profile_spec.rb create mode 100644 spec/lib/gitlab/request_profiler_spec.rb create mode 100644 spec/lib/security/ci_configuration/container_scanning_build_action_spec.rb create mode 100644 spec/requests/request_profiler_spec.rb create mode 100644 spec/services/security/ci_configuration/container_scanning_create_service_spec.rb diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 43eb86942f9..300706a4d8e 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -160,6 +160,7 @@ Lint/MixedRegexpCaptureTypes: - 'lib/gitlab/diff/suggestions_parser.rb' - 'lib/gitlab/github_import/representation/note.rb' - 'lib/gitlab/metrics/system.rb' + - 'lib/gitlab/request_profiler/profile.rb' - 'lib/gitlab/slash_commands/issue_move.rb' - 'lib/gitlab/slash_commands/issue_new.rb' - 'lib/gitlab/slash_commands/run.rb' diff --git a/.rubocop_todo/gitlab/namespaced_class.yml b/.rubocop_todo/gitlab/namespaced_class.yml index 6858dcc36ce..40afa0d0667 100644 --- a/.rubocop_todo/gitlab/namespaced_class.yml +++ b/.rubocop_todo/gitlab/namespaced_class.yml @@ -875,6 +875,7 @@ Gitlab/NamespacedClass: - app/workers/repository_import_worker.rb - app/workers/repository_remove_remote_worker.rb - app/workers/repository_update_remote_mirror_worker.rb + - app/workers/requests_profiles_worker.rb - app/workers/run_pipeline_schedule_worker.rb - app/workers/schedule_merge_request_cleanup_refs_worker.rb - app/workers/schedule_migrate_external_diffs_worker.rb diff --git a/.rubocop_todo/rails/save_bang.yml b/.rubocop_todo/rails/save_bang.yml index 2f3e3e5e682..e1698a83682 100644 --- a/.rubocop_todo/rails/save_bang.yml +++ b/.rubocop_todo/rails/save_bang.yml @@ -2,16 +2,3 @@ Rails/SaveBang: Exclude: - ee/spec/lib/analytics/merge_request_metrics_calculator_spec.rb - - spec/lib/backup/manager_spec.rb - - spec/lib/gitlab/alerting/alert_spec.rb - - spec/lib/gitlab/analytics/cycle_analytics/records_fetcher_spec.rb - - spec/lib/gitlab/auth/ldap/user_spec.rb - - spec/lib/gitlab/auth/o_auth/user_spec.rb - - spec/lib/gitlab/auth/saml/user_spec.rb - - spec/lib/gitlab/auth_spec.rb - - spec/lib/gitlab/authorized_keys_spec.rb - - spec/lib/gitlab/bitbucket_server_import/importer_spec.rb - - spec/lib/gitlab/cycle_analytics/base_event_fetcher_spec.rb - - spec/lib/gitlab/database/custom_structure_spec.rb - - spec/lib/gitlab/database/partitioning_migration_helpers/table_management_helpers_spec.rb - - spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION index ba0a719118c..a63cb35e6f0 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -1.51.0 +1.52.0 diff --git a/app/assets/javascripts/clusters_list/components/agents.vue b/app/assets/javascripts/clusters_list/components/agents.vue index 4fc421e7c31..bf096f53e9d 100644 --- a/app/assets/javascripts/clusters_list/components/agents.vue +++ b/app/assets/javascripts/clusters_list/components/agents.vue @@ -1,11 +1,29 @@ @@ -151,6 +182,24 @@ export default {
+ + +

{{ $options.i18n.feedbackBannerText }}

+
+
+ - {{ s__('ClusterAgents|An error occurred while loading your GitLab Agents') }} + {{ $options.i18n.error }} diff --git a/app/assets/javascripts/clusters_list/components/clusters_view_all.vue b/app/assets/javascripts/clusters_list/components/clusters_view_all.vue index bd1a15dba8c..b730c0adfa2 100644 --- a/app/assets/javascripts/clusters_list/components/clusters_view_all.vue +++ b/app/assets/javascripts/clusters_list/components/clusters_view_all.vue @@ -123,7 +123,7 @@ export default {