From 6200f1207986fa8a3c578bdf23977dc1a65c7771 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 19 Nov 2024 21:32:51 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../lint/redundant_safe_navigation.yml | 7 - Gemfile | 2 +- Gemfile.checksum | 12 +- Gemfile.lock | 20 +- Gemfile.next.checksum | 14 +- Gemfile.next.lock | 22 +- .../javascripts/ci/jobs_page/constants.js | 1 - app/assets/javascripts/ci/jobs_page/index.js | 11 +- .../ci/jobs_page/jobs_page_app.vue | 17 +- app/helpers/routing/graphql_helper.rb | 4 - app/models/merge_request.rb | 15 - .../packages/nuget/version_helpers.rb | 4 +- .../mergeability/check_ci_status_service.rb | 31 +- app/views/projects/jobs/index.html.haml | 2 +- .../update_approval_rules_for_related_mrs.yml | 2 +- .../prompt_migration_ci_editor_assistant.yml | 9 - ...ci_build_dependencies_artifacts_logger.yml | 2 +- ...job_artifacts_backlog_large_loop_limit.yml | 2 +- .../ops/ci_jwt_groups_direct.yml | 2 +- .../feature_flags/ops/ci_unlock_pipelines.yml | 2 +- .../ops/ci_unlock_pipelines_extra_low.yml | 2 +- .../ops/ci_unlock_pipelines_high.yml | 2 +- .../ops/ci_unlock_pipelines_medium.yml | 2 +- .../projects_build_artifacts_size_refresh.yml | 2 +- ...ects_build_artifacts_size_refresh_high.yml | 2 +- ...ts_build_artifacts_size_refresh_medium.yml | 2 +- .../ops/s3_multithreaded_uploads.yml | 2 +- .../ops/split_log_bulk_increment_counter.yml | 2 +- config/upgrade_path.yml | 6 + ...ll_terraform_state_versions_project_id.yml | 2 +- ...bility_namespace_historical_statistics.yml | 7 + ...5_add_personal_namespace_id_to_events_2.rb | 3 + ...ability_namespace_historical_statistics.rb | 27 ++ ...ill_terraform_state_versions_project_id.rb | 21 ++ db/schema_migrations/20241113144244 | 1 + db/schema_migrations/20241118232838 | 1 + .../geo/replication/troubleshooting/common.md | 15 + doc/api/members.md | 290 ++++++++++-------- ...ability_namespace_historical_statistics.rb | 14 + lib/gitlab/ci/jwt_v2/claim_mapper.rb | 2 +- lib/gitlab/etag_caching/router/graphql.rb | 5 - .../ci_configuration/sast_build_action.rb | 4 +- locale/gitlab.pot | 15 + package.json | 2 +- scripts/frontend/quarantined_vue3_specs.txt | 1 - spec/config/upgrade_path_spec.rb | 2 +- spec/features/projects/blobs/edit_spec.rb | 4 +- .../ci/jobs_page/job_page_app_spec.js | 40 +-- .../edit/components/integration_form_spec.js | 78 +++-- .../packages_list_app_spec.js.snap | 2 +- spec/helpers/gitlab_routing_helper_spec.rb | 4 - spec/lib/gitlab/etag_caching/router_spec.rb | 9 - ...ty_namespace_historical_statistics_spec.rb | 27 ++ spec/models/merge_request_spec.rb | 199 +----------- .../merge_when_checks_pass_service_spec.rb | 4 +- .../merge_requests/merge_service_spec.rb | 4 +- .../check_ci_status_service_spec.rb | 187 ++++++----- .../requests/set_current_context_examples.rb | 2 +- storybook/config/webpack.config.js | 25 ++ yarn.lock | 8 +- 60 files changed, 587 insertions(+), 621 deletions(-) delete mode 100644 .rubocop_todo/lint/redundant_safe_navigation.yml delete mode 100644 config/feature_flags/experiment/prompt_migration_ci_editor_assistant.yml create mode 100644 db/docs/batched_background_migrations/backfill_vulnerability_namespace_historical_statistics.yml create mode 100644 db/post_migrate/20241113144244_queue_backfill_vulnerability_namespace_historical_statistics.rb create mode 100644 db/post_migrate/20241118232838_finalize_backfill_terraform_state_versions_project_id.rb create mode 100644 db/schema_migrations/20241113144244 create mode 100644 db/schema_migrations/20241118232838 create mode 100644 lib/gitlab/background_migration/backfill_vulnerability_namespace_historical_statistics.rb create mode 100644 spec/migrations/20241113144244_queue_backfill_vulnerability_namespace_historical_statistics_spec.rb diff --git a/.rubocop_todo/lint/redundant_safe_navigation.yml b/.rubocop_todo/lint/redundant_safe_navigation.yml deleted file mode 100644 index 4fa14cad3b2..00000000000 --- a/.rubocop_todo/lint/redundant_safe_navigation.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -# Cop supports --autocorrect. -Lint/RedundantSafeNavigation: - Exclude: - - 'app/presenters/packages/nuget/version_helpers.rb' - - 'lib/gitlab/ci/jwt_v2/claim_mapper.rb' - - 'lib/security/ci_configuration/sast_build_action.rb' diff --git a/Gemfile b/Gemfile index 4d46277862c..92da2c5e600 100644 --- a/Gemfile +++ b/Gemfile @@ -480,7 +480,7 @@ group :development do gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'ruby-lsp', "~> 0.19.0", require: false, feature_category: :tooling + gem 'ruby-lsp', "~> 0.21.0", require: false, feature_category: :tooling gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling diff --git a/Gemfile.checksum b/Gemfile.checksum index 093036c9b46..187a66cccc4 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -510,7 +510,7 @@ {"name":"premailer","version":"1.23.0","platform":"ruby","checksum":"f0d7f6ba299559c96ddf982aa5263f85e5617c86437c8d8ffff120813b2d7efb"}, {"name":"premailer-rails","version":"1.12.0","platform":"ruby","checksum":"c13815d161b9bc7f7d3d81396b0bb0a61a90fa9bd89931548bf4e537c7710400"}, {"name":"prime","version":"0.1.2","platform":"ruby","checksum":"d4e956cadfaf04de036dc7dc74f95bf6a285a62cc509b28b7a66b245d19fe3a4"}, -{"name":"prism","version":"1.1.0","platform":"ruby","checksum":"45f0d269eb09d0e2d9380fe41a96955386f7990c8e8d65de64a0b6a5a6be9b7b"}, +{"name":"prism","version":"1.2.0","platform":"ruby","checksum":"24ff9cd3232346e68052659f14c9a618022ea98935f774df465206aba5c06d2f"}, {"name":"proc_to_ast","version":"0.1.0","platform":"ruby","checksum":"92a73fa66e2250a83f8589f818b0751bcf227c68f85916202df7af85082f8691"}, {"name":"prometheus-client-mmap","version":"1.1.1","platform":"aarch64-linux","checksum":"35fd23296854a1888c58198cc5776a99e5f5a729bc4262327cd1c44219e7dda2"}, {"name":"prometheus-client-mmap","version":"1.1.1","platform":"arm64-darwin","checksum":"1fc09a3f76cb3c69fde085dc63a986524e2606b2e36cc64122b49836ee6b1779"}, @@ -550,7 +550,7 @@ {"name":"rb-fsevent","version":"0.11.2","platform":"ruby","checksum":"43900b972e7301d6570f64b850a5aa67833ee7d87b458ee92805d56b7318aefe"}, {"name":"rb-inotify","version":"0.10.1","platform":"ruby","checksum":"050062d4f31d307cca52c3f6a7f4b946df8de25fc4bd373e1a5142e41034a7ca"}, {"name":"rb_sys","version":"0.9.94","platform":"ruby","checksum":"8a35bed8e7906867b958be58772c779fc4afacacc86ceab921149cccb9eb4cca"}, -{"name":"rbs","version":"3.5.1","platform":"ruby","checksum":"8ed89f6b088796e67ebc88141eb5b0f1a61a6a76cb63a499fdf119c58219cbae"}, +{"name":"rbs","version":"3.6.1","platform":"ruby","checksum":"ed7273d018556844583d1785ac54194e67eec594d68e317d57fa90ad035532c0"}, {"name":"rbtrace","version":"0.5.1","platform":"ruby","checksum":"e8cba64d462bfb8ba102d7be2ecaacc789247d52ac587d8003549d909cb9c5dc"}, {"name":"rchardet","version":"1.8.0","platform":"ruby","checksum":"693acd5253d5ade81a51940697955f6dd4bb2f0d245bda76a8e23deec70a52c7"}, {"name":"re2","version":"2.7.0","platform":"aarch64-linux","checksum":"778921298b6e8aba26a6230dd298c9b361b92e45024f81fa6aee788060fa307c"}, @@ -615,9 +615,9 @@ {"name":"rubocop-rspec","version":"3.0.5","platform":"ruby","checksum":"c6a8e29fb1b00d227c32df159e92f5ebb9e0ff734e52955fb13aff5c74977e0f"}, {"name":"rubocop-rspec_rails","version":"2.30.0","platform":"ruby","checksum":"888112e83f9d7ef7ad2397e9d69a0b9614a4bae24f072c399804a180f80c4c46"}, {"name":"ruby-fogbugz","version":"0.3.0","platform":"ruby","checksum":"5e04cde474648f498a71cf1e1a7ab42c66b953862fbe224f793ec0a7a1d5f657"}, -{"name":"ruby-lsp","version":"0.19.1","platform":"ruby","checksum":"d013f937a6a3e03f19026c5234d7f22f219e45f3fdb39a80a3e816b0a2148ced"}, -{"name":"ruby-lsp-rails","version":"0.3.17","platform":"ruby","checksum":"24e80e313b2a8990e1fe37a4165b3877b3b587ef1de931ae89338512502d1fd1"}, -{"name":"ruby-lsp-rspec","version":"0.1.15","platform":"ruby","checksum":"d1eed4aa9d16f41ab04943ca881f7ce5389958fb8c88da2d3a1df9cefdffbd9d"}, +{"name":"ruby-lsp","version":"0.21.3","platform":"ruby","checksum":"51c4e327740ce2f09e59e241fe6e67242ba8fc6fb200dddfedd4cb57d9dd5ec1"}, +{"name":"ruby-lsp-rails","version":"0.3.26","platform":"ruby","checksum":"f58e92c17a78a7df27bd563b32cc1557400fcd5e7f1d0c782ca272b9b34b6351"}, +{"name":"ruby-lsp-rspec","version":"0.1.18","platform":"ruby","checksum":"4e6e892f52eb4f548cb43e61c59de43bcc9d785f588f137e61601bb7271dc461"}, {"name":"ruby-magic","version":"0.6.0","platform":"ruby","checksum":"7b2138877b7d23aff812c95564eba6473b74b815ef85beb0eb792e729a2b6101"}, {"name":"ruby-openai","version":"3.7.0","platform":"ruby","checksum":"fb735d4c055e282ade264cab9864944c05a8a10e0cddd45a0551e8a9851b1850"}, {"name":"ruby-progressbar","version":"1.11.0","platform":"ruby","checksum":"cc127db3866dc414ffccbf92928a241e585b3aa2b758a5563e74a6ee0f57d50a"}, @@ -684,7 +684,7 @@ {"name":"snaky_hash","version":"2.0.0","platform":"ruby","checksum":"fe8b2e39e8ff69320f7812af73ea06401579e29ff1734a7009567391600687de"}, {"name":"snowplow-tracker","version":"0.8.0","platform":"ruby","checksum":"7ba6f4f1443a829845fd28e63eda72d9d3d247f485310ddcccaebbc52b734a38"}, {"name":"solargraph","version":"0.47.2","platform":"ruby","checksum":"87ca4b799b9155c2c31c15954c483e952fdacd800f52d6709b901dd447bcac6a"}, -{"name":"sorbet-runtime","version":"0.5.11266","platform":"ruby","checksum":"deb2c3054811fbcce0a888682d820f691895b84e3d8ac7bc7959e988ca0c58bb"}, +{"name":"sorbet-runtime","version":"0.5.11647","platform":"ruby","checksum":"64b65112f2e6a5323310ca9ac0d7d9a6be63aade5a62a6225fe066042ff4fdb6"}, {"name":"spamcheck","version":"1.3.0","platform":"ruby","checksum":"a46082752257838d8484c844736e309ec499f85dcc51283a5f973b33f1c994f5"}, {"name":"spring","version":"4.1.0","platform":"ruby","checksum":"f17f080fb0df558d663c897a6229ed3d5cc54819ab51876ea6eef49a67f0a3cb"}, {"name":"spring-commands-rspec","version":"1.0.4","platform":"ruby","checksum":"6202e54fa4767452e3641461a83347645af478bf45dddcca9737b43af0dd1a2c"}, diff --git a/Gemfile.lock b/Gemfile.lock index 4a58dbdc424..c55e7bbf2a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1431,7 +1431,7 @@ GEM prime (0.1.2) forwardable singleton - prism (1.1.0) + prism (1.2.0) proc_to_ast (0.1.0) coderay parser @@ -1519,7 +1519,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rb_sys (0.9.94) - rbs (3.5.1) + rbs (3.6.1) logger rbtrace (0.5.1) ffi (>= 1.0.6) @@ -1658,15 +1658,15 @@ GEM ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) - ruby-lsp (0.19.1) + ruby-lsp (0.21.3) language_server-protocol (~> 3.17.0) - prism (>= 1.1, < 2.0) + prism (>= 1.2, < 2.0) rbs (>= 3, < 4) sorbet-runtime (>= 0.5.10782) - ruby-lsp-rails (0.3.17) - ruby-lsp (>= 0.19.0, < 0.20.0) - ruby-lsp-rspec (0.1.15) - ruby-lsp (~> 0.19.0) + ruby-lsp-rails (0.3.26) + ruby-lsp (>= 0.21.2, < 0.22.0) + ruby-lsp-rspec (0.1.18) + ruby-lsp (~> 0.21.0) ruby-magic (0.6.0) mini_portile2 (~> 2.8) ruby-openai (3.7.0) @@ -1765,7 +1765,7 @@ GEM thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) - sorbet-runtime (0.5.11266) + sorbet-runtime (0.5.11647) spamcheck (1.3.0) grpc (~> 1.0) spring (4.1.0) @@ -2262,7 +2262,7 @@ DEPENDENCIES rspec_profiling (~> 0.0.9) rubocop ruby-fogbugz (~> 0.3.0) - ruby-lsp (~> 0.19.0) + ruby-lsp (~> 0.21.0) ruby-lsp-rails (~> 0.3.6) ruby-lsp-rspec (~> 0.1.10) ruby-magic (~> 0.6) diff --git a/Gemfile.next.checksum b/Gemfile.next.checksum index 9bca9cb37cf..7d29b1e10c2 100644 --- a/Gemfile.next.checksum +++ b/Gemfile.next.checksum @@ -518,7 +518,7 @@ {"name":"premailer","version":"1.23.0","platform":"ruby","checksum":"f0d7f6ba299559c96ddf982aa5263f85e5617c86437c8d8ffff120813b2d7efb"}, {"name":"premailer-rails","version":"1.12.0","platform":"ruby","checksum":"c13815d161b9bc7f7d3d81396b0bb0a61a90fa9bd89931548bf4e537c7710400"}, {"name":"prime","version":"0.1.2","platform":"ruby","checksum":"d4e956cadfaf04de036dc7dc74f95bf6a285a62cc509b28b7a66b245d19fe3a4"}, -{"name":"prism","version":"1.1.0","platform":"ruby","checksum":"45f0d269eb09d0e2d9380fe41a96955386f7990c8e8d65de64a0b6a5a6be9b7b"}, +{"name":"prism","version":"1.2.0","platform":"ruby","checksum":"24ff9cd3232346e68052659f14c9a618022ea98935f774df465206aba5c06d2f"}, {"name":"proc_to_ast","version":"0.1.0","platform":"ruby","checksum":"92a73fa66e2250a83f8589f818b0751bcf227c68f85916202df7af85082f8691"}, {"name":"prometheus-client-mmap","version":"1.1.1","platform":"aarch64-linux","checksum":"35fd23296854a1888c58198cc5776a99e5f5a729bc4262327cd1c44219e7dda2"}, {"name":"prometheus-client-mmap","version":"1.1.1","platform":"arm64-darwin","checksum":"1fc09a3f76cb3c69fde085dc63a986524e2606b2e36cc64122b49836ee6b1779"}, @@ -561,10 +561,10 @@ {"name":"rb-fsevent","version":"0.11.2","platform":"ruby","checksum":"43900b972e7301d6570f64b850a5aa67833ee7d87b458ee92805d56b7318aefe"}, {"name":"rb-inotify","version":"0.10.1","platform":"ruby","checksum":"050062d4f31d307cca52c3f6a7f4b946df8de25fc4bd373e1a5142e41034a7ca"}, {"name":"rb_sys","version":"0.9.94","platform":"ruby","checksum":"8a35bed8e7906867b958be58772c779fc4afacacc86ceab921149cccb9eb4cca"}, -{"name":"rbs","version":"3.5.1","platform":"ruby","checksum":"8ed89f6b088796e67ebc88141eb5b0f1a61a6a76cb63a499fdf119c58219cbae"}, +{"name":"rbs","version":"3.6.1","platform":"ruby","checksum":"ed7273d018556844583d1785ac54194e67eec594d68e317d57fa90ad035532c0"}, {"name":"rbtrace","version":"0.5.1","platform":"ruby","checksum":"e8cba64d462bfb8ba102d7be2ecaacc789247d52ac587d8003549d909cb9c5dc"}, {"name":"rchardet","version":"1.8.0","platform":"ruby","checksum":"693acd5253d5ade81a51940697955f6dd4bb2f0d245bda76a8e23deec70a52c7"}, -{"name":"rdoc","version":"6.7.0","platform":"ruby","checksum":"b17d5f0f57b0853d7b880d4360a32c7caf8dbb81f8503a36426df809e617f379"}, +{"name":"rdoc","version":"6.8.1","platform":"ruby","checksum":"0128002d1bfc4892bdd780940841e4ca41275f63781fd832d11bc8ba4461462c"}, {"name":"re2","version":"2.7.0","platform":"aarch64-linux","checksum":"778921298b6e8aba26a6230dd298c9b361b92e45024f81fa6aee788060fa307c"}, {"name":"re2","version":"2.7.0","platform":"arm-linux","checksum":"d328b5286d83ae265e13b855da8e348a976f80f91b748045b52073a570577954"}, {"name":"re2","version":"2.7.0","platform":"arm64-darwin","checksum":"7d993f27a1afac4001c539a829e2af211ced62604930c90df32a307cf74cb4a4"}, @@ -628,9 +628,9 @@ {"name":"rubocop-rspec","version":"3.0.5","platform":"ruby","checksum":"c6a8e29fb1b00d227c32df159e92f5ebb9e0ff734e52955fb13aff5c74977e0f"}, {"name":"rubocop-rspec_rails","version":"2.30.0","platform":"ruby","checksum":"888112e83f9d7ef7ad2397e9d69a0b9614a4bae24f072c399804a180f80c4c46"}, {"name":"ruby-fogbugz","version":"0.3.0","platform":"ruby","checksum":"5e04cde474648f498a71cf1e1a7ab42c66b953862fbe224f793ec0a7a1d5f657"}, -{"name":"ruby-lsp","version":"0.19.1","platform":"ruby","checksum":"d013f937a6a3e03f19026c5234d7f22f219e45f3fdb39a80a3e816b0a2148ced"}, -{"name":"ruby-lsp-rails","version":"0.3.17","platform":"ruby","checksum":"24e80e313b2a8990e1fe37a4165b3877b3b587ef1de931ae89338512502d1fd1"}, -{"name":"ruby-lsp-rspec","version":"0.1.15","platform":"ruby","checksum":"d1eed4aa9d16f41ab04943ca881f7ce5389958fb8c88da2d3a1df9cefdffbd9d"}, +{"name":"ruby-lsp","version":"0.21.3","platform":"ruby","checksum":"51c4e327740ce2f09e59e241fe6e67242ba8fc6fb200dddfedd4cb57d9dd5ec1"}, +{"name":"ruby-lsp-rails","version":"0.3.26","platform":"ruby","checksum":"f58e92c17a78a7df27bd563b32cc1557400fcd5e7f1d0c782ca272b9b34b6351"}, +{"name":"ruby-lsp-rspec","version":"0.1.18","platform":"ruby","checksum":"4e6e892f52eb4f548cb43e61c59de43bcc9d785f588f137e61601bb7271dc461"}, {"name":"ruby-magic","version":"0.6.0","platform":"ruby","checksum":"7b2138877b7d23aff812c95564eba6473b74b815ef85beb0eb792e729a2b6101"}, {"name":"ruby-openai","version":"3.7.0","platform":"ruby","checksum":"fb735d4c055e282ade264cab9864944c05a8a10e0cddd45a0551e8a9851b1850"}, {"name":"ruby-progressbar","version":"1.11.0","platform":"ruby","checksum":"cc127db3866dc414ffccbf92928a241e585b3aa2b758a5563e74a6ee0f57d50a"}, @@ -697,7 +697,7 @@ {"name":"snaky_hash","version":"2.0.0","platform":"ruby","checksum":"fe8b2e39e8ff69320f7812af73ea06401579e29ff1734a7009567391600687de"}, {"name":"snowplow-tracker","version":"0.8.0","platform":"ruby","checksum":"7ba6f4f1443a829845fd28e63eda72d9d3d247f485310ddcccaebbc52b734a38"}, {"name":"solargraph","version":"0.47.2","platform":"ruby","checksum":"87ca4b799b9155c2c31c15954c483e952fdacd800f52d6709b901dd447bcac6a"}, -{"name":"sorbet-runtime","version":"0.5.11266","platform":"ruby","checksum":"deb2c3054811fbcce0a888682d820f691895b84e3d8ac7bc7959e988ca0c58bb"}, +{"name":"sorbet-runtime","version":"0.5.11647","platform":"ruby","checksum":"64b65112f2e6a5323310ca9ac0d7d9a6be63aade5a62a6225fe066042ff4fdb6"}, {"name":"spamcheck","version":"1.3.0","platform":"ruby","checksum":"a46082752257838d8484c844736e309ec499f85dcc51283a5f973b33f1c994f5"}, {"name":"spring","version":"4.1.0","platform":"ruby","checksum":"f17f080fb0df558d663c897a6229ed3d5cc54819ab51876ea6eef49a67f0a3cb"}, {"name":"spring-commands-rspec","version":"1.0.4","platform":"ruby","checksum":"6202e54fa4767452e3641461a83347645af478bf45dddcca9737b43af0dd1a2c"}, diff --git a/Gemfile.next.lock b/Gemfile.next.lock index 69c4ed9a4bd..8df3db06071 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -1446,7 +1446,7 @@ GEM prime (0.1.2) forwardable singleton - prism (1.1.0) + prism (1.2.0) proc_to_ast (0.1.0) coderay parser @@ -1541,14 +1541,14 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rb_sys (0.9.94) - rbs (3.5.1) + rbs (3.6.1) logger rbtrace (0.5.1) ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) rchardet (1.8.0) - rdoc (6.7.0) + rdoc (6.8.1) psych (>= 4.0.0) re2 (2.7.0) mini_portile2 (~> 2.8.5) @@ -1684,15 +1684,15 @@ GEM ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) - ruby-lsp (0.19.1) + ruby-lsp (0.21.3) language_server-protocol (~> 3.17.0) - prism (>= 1.1, < 2.0) + prism (>= 1.2, < 2.0) rbs (>= 3, < 4) sorbet-runtime (>= 0.5.10782) - ruby-lsp-rails (0.3.17) - ruby-lsp (>= 0.19.0, < 0.20.0) - ruby-lsp-rspec (0.1.15) - ruby-lsp (~> 0.19.0) + ruby-lsp-rails (0.3.26) + ruby-lsp (>= 0.21.2, < 0.22.0) + ruby-lsp-rspec (0.1.18) + ruby-lsp (~> 0.21.0) ruby-magic (0.6.0) mini_portile2 (~> 2.8) ruby-openai (3.7.0) @@ -1791,7 +1791,7 @@ GEM thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) - sorbet-runtime (0.5.11266) + sorbet-runtime (0.5.11647) spamcheck (1.3.0) grpc (~> 1.0) spring (4.1.0) @@ -2289,7 +2289,7 @@ DEPENDENCIES rspec_profiling (~> 0.0.9) rubocop ruby-fogbugz (~> 0.3.0) - ruby-lsp (~> 0.19.0) + ruby-lsp (~> 0.21.0) ruby-lsp-rails (~> 0.3.6) ruby-lsp-rspec (~> 0.1.10) ruby-magic (~> 0.6) diff --git a/app/assets/javascripts/ci/jobs_page/constants.js b/app/assets/javascripts/ci/jobs_page/constants.js index 12024a8e7fd..75f299a4424 100644 --- a/app/assets/javascripts/ci/jobs_page/constants.js +++ b/app/assets/javascripts/ci/jobs_page/constants.js @@ -68,7 +68,6 @@ export const DEFAULT_FIELDS = [ export const JOBS_DEFAULT_FIELDS = DEFAULT_FIELDS.filter((field) => field.key !== 'stage'); export const JOBS_TAB_FIELDS = DEFAULT_FIELDS.filter((field) => field.key !== 'pipeline'); -export const POLL_INTERVAL = 10000; export const JOBS_PER_PAGE = 30; export const DEFAULT_PAGINATION = { first: JOBS_PER_PAGE, diff --git a/app/assets/javascripts/ci/jobs_page/index.js b/app/assets/javascripts/ci/jobs_page/index.js index 6ba78ba6411..745a9f0757a 100644 --- a/app/assets/javascripts/ci/jobs_page/index.js +++ b/app/assets/javascripts/ci/jobs_page/index.js @@ -19,14 +19,8 @@ export default (containerId = 'js-jobs-table') => { return false; } - const { - fullPath, - jobStatuses, - pipelineEditorPath, - emptyStateSvgPath, - admin, - graphqlResourceEtag, - } = containerEl.dataset; + const { fullPath, jobStatuses, pipelineEditorPath, emptyStateSvgPath, admin } = + containerEl.dataset; return new Vue({ el: containerEl, @@ -37,7 +31,6 @@ export default (containerId = 'js-jobs-table') => { pipelineEditorPath, jobStatuses: JSON.parse(jobStatuses), admin: parseBoolean(admin), - graphqlResourceEtag, }, render(createElement) { return createElement(JobsTableApp); diff --git a/app/assets/javascripts/ci/jobs_page/jobs_page_app.vue b/app/assets/javascripts/ci/jobs_page/jobs_page_app.vue index b26732af983..c48a9d1daa6 100644 --- a/app/assets/javascripts/ci/jobs_page/jobs_page_app.vue +++ b/app/assets/javascripts/ci/jobs_page/jobs_page_app.vue @@ -1,6 +1,5 @@