diff --git a/.rubocop_todo/layout/class_structure.yml b/.rubocop_todo/layout/class_structure.yml index 28319f1d010..d70cef4d165 100644 --- a/.rubocop_todo/layout/class_structure.yml +++ b/.rubocop_todo/layout/class_structure.yml @@ -227,7 +227,6 @@ Layout/ClassStructure: - 'ee/app/models/work_items/widgets/rolledup_dates.rb' - 'ee/app/replicators/geo/lfs_object_replicator.rb' - 'ee/app/replicators/geo/terraform_state_version_replicator.rb' - - 'ee/app/services/ai/store_repository_xray_service.rb' - 'ee/app/services/analytics/value_stream_dashboard/top_level_group_counter_service.rb' - 'ee/app/services/app_sec/dast/scan_configs/build_service.rb' - 'ee/app/services/click_house/data_ingestion/ci_finished_builds_sync_service.rb' diff --git a/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml b/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml index a8c6fd88795..b3cd63a6e92 100644 --- a/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml +++ b/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml @@ -310,7 +310,6 @@ Layout/LineEndStringConcatenationIndentation: - 'ee/spec/requests/groups/protected_environments_controller_spec.rb' - 'ee/spec/requests/users/registrations_identity_verification_controller_spec.rb' - 'ee/spec/serializers/integrations/field_entity_spec.rb' - - 'ee/spec/services/ai/store_repository_xray_service_spec.rb' - 'ee/spec/services/boards/epic_lists/destroy_service_spec.rb' - 'ee/spec/services/ci/destroy_pipeline_service_spec.rb' - 'ee/spec/services/clusters/agent_tokens/create_service_audit_log_spec.rb' diff --git a/.rubocop_todo/performance/string_identifier_argument.yml b/.rubocop_todo/performance/string_identifier_argument.yml index b9307f94c8e..55873c24cfb 100644 --- a/.rubocop_todo/performance/string_identifier_argument.yml +++ b/.rubocop_todo/performance/string_identifier_argument.yml @@ -80,7 +80,6 @@ Performance/StringIdentifierArgument: - 'ee/spec/support/helpers/search_results_helpers.rb' - 'ee/spec/support/shared_examples/features/protected_branches_access_control_shared_examples.rb' - 'ee/spec/support/shared_examples/google_cloud_platform/artifact_registry/services_shared_examples.rb' - - 'ee/spec/support/shared_examples/lib/gitlab/elastic/search_results_shared_examples.rb' - 'ee/spec/support/shared_examples/policies/monitor_feature_visibility_shared_examples.rb' - 'ee/spec/workers/concerns/elastic/migration_options_spec.rb' - 'ee/spec/workers/elastic_namespace_rollout_worker_spec.rb' diff --git a/.rubocop_todo/rspec/example_wording.yml b/.rubocop_todo/rspec/example_wording.yml index 5a93cd6aa26..b1afacfcba7 100644 --- a/.rubocop_todo/rspec/example_wording.yml +++ b/.rubocop_todo/rspec/example_wording.yml @@ -18,13 +18,11 @@ RSpec/ExampleWording: - 'ee/spec/requests/api/graphql/project/product_analytics/product_analytics_spec.rb' - 'ee/spec/requests/api/groups_spec.rb' - 'ee/spec/requests/projects/security/scanned_resources_controller_spec.rb' - - 'ee/spec/services/ai/store_repository_xray_service_spec.rb' - 'ee/spec/services/ci/minutes/update_project_and_namespace_usage_service_spec.rb' - 'ee/spec/services/ci/sync_reports_to_approval_rules_service_spec.rb' - 'ee/spec/services/merge_requests/reset_approvals_service_spec.rb' - 'ee/spec/services/quick_actions/interpret_service_spec.rb' - 'ee/spec/services/security/ingestion/schedule_mark_dropped_as_resolved_service_spec.rb' - - 'ee/spec/workers/ai/store_repository_xray_worker_spec.rb' - 'qa/spec/specs/helpers/context_selector_spec.rb' - 'spec/controllers/projects/milestones_controller_spec.rb' - 'spec/features/groups/merge_requests_spec.rb' diff --git a/Gemfile b/Gemfile index c52697bddee..f02a216a821 100644 --- a/Gemfile +++ b/Gemfile @@ -594,7 +594,7 @@ group :test do # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab_quality-test_tooling', '~> 2.1.0', require: false, feature_category: :tooling + gem 'gitlab_quality-test_tooling', '~> 2.2.0', require: false, feature_category: :tooling end gem 'octokit', '~> 9.0', feature_category: :importers diff --git a/Gemfile.checksum b/Gemfile.checksum index 35d20f3741d..572d190e17a 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -239,7 +239,7 @@ {"name":"gitlab-styles","version":"13.0.1","platform":"ruby","checksum":"bf1840fe97b215ab76fe1f1a83af0aee30d33ded905415918462b832004b68bd"}, {"name":"gitlab_chronic_duration","version":"0.12.0","platform":"ruby","checksum":"0d766944d415b5c831f176871ee8625783fc0c5bfbef2d79a3a616f207ffc16d"}, {"name":"gitlab_omniauth-ldap","version":"2.2.0","platform":"ruby","checksum":"bb4d20acb3b123ed654a8f6a47d3fac673ece7ed0b6992edb92dca14bad2838c"}, -{"name":"gitlab_quality-test_tooling","version":"2.1.0","platform":"ruby","checksum":"834bb046677926399170946004debc0e7da5f4354e08c316c2b7d3f98a74e47c"}, +{"name":"gitlab_quality-test_tooling","version":"2.2.0","platform":"ruby","checksum":"d8fdaa7e5b529d0157485db4c81876a492303b53f30d9e8246f91f37f689295a"}, {"name":"globalid","version":"1.1.0","platform":"ruby","checksum":"b337e1746f0c8cb0a6c918234b03a1ddeb4966206ce288fbb57779f59b2d154f"}, {"name":"gon","version":"6.4.0","platform":"ruby","checksum":"e3a618d659392890f1aa7db420f17c75fd7d35aeb5f8fe003697d02c4b88d2f0"}, {"name":"google-apis-androidpublisher_v3","version":"0.34.0","platform":"ruby","checksum":"d7e1d7dd92f79c498fe2082222a1740d788e022e660c135564b3fd299cab5425"}, @@ -397,7 +397,7 @@ {"name":"mixlib-shellout","version":"3.2.7","platform":"ruby","checksum":"46f6d1f9c77e689a443081c5cac336203343f0f2224db06b80d39ae4cd797c7e"}, {"name":"mixlib-shellout","version":"3.2.7","platform":"universal-mingw32","checksum":"4d7bea07e347cc8de2b4bc22f4d8f84d7bb8165cf900d26b532d0d9fa4928a19"}, {"name":"mixlib-shellout","version":"3.2.7","platform":"x64-mingw-ucrt","checksum":"de01743f678b66c275ea5f40749cde6c056651d1bb6d320711779394d2eec654"}, -{"name":"mize","version":"0.6.0","platform":"ruby","checksum":"3f1a0f52cb5c158e43e93a6dd3be896d9c7dd345d76eb1bd9f26088681db2363"}, +{"name":"mize","version":"0.6.1","platform":"ruby","checksum":"4031558979ff5426fda24c75a149b4e4c0faf4cacf2fae8938f83866ab94b780"}, {"name":"msgpack","version":"1.5.4","platform":"java","checksum":"05b3bd16a65dddc64c878634b7ecb9cd613569ca3dd6e480d7295626a0a3f562"}, {"name":"msgpack","version":"1.5.4","platform":"ruby","checksum":"a53db320fba40f58c07c5b66ed9fd4d73cbe8eba4cb28fe9e3218444341a4e09"}, {"name":"multi_json","version":"1.14.1","platform":"ruby","checksum":"d971296c0eacea289d31e4a7ab7ac5eda97262c62bbc8c110de4f5e36425c577"}, diff --git a/Gemfile.lock b/Gemfile.lock index 235309d76a9..d9012471590 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -789,7 +789,7 @@ GEM omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (2.1.0) + gitlab_quality-test_tooling (2.2.0) activesupport (>= 7.0, < 7.2) amatch (~> 0.4.1) fog-google (~> 1.24, >= 1.24.1) @@ -1160,7 +1160,7 @@ GEM mixlib-log (3.0.9) mixlib-shellout (3.2.7) chef-utils - mize (0.6.0) + mize (0.6.1) msgpack (1.5.4) multi_json (1.14.1) multi_xml (0.6.0) @@ -2093,7 +2093,7 @@ DEPENDENCIES gitlab-utils! gitlab_chronic_duration (~> 0.12) gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 2.1.0) + gitlab_quality-test_tooling (~> 2.2.0) gon (~> 6.4.0) google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-cloudbilling_v1 (~> 0.21.0) diff --git a/Gemfile.next.checksum b/Gemfile.next.checksum index eb4dd0acdbf..cfdb9aa3e1a 100644 --- a/Gemfile.next.checksum +++ b/Gemfile.next.checksum @@ -240,7 +240,7 @@ {"name":"gitlab-styles","version":"13.0.1","platform":"ruby","checksum":"bf1840fe97b215ab76fe1f1a83af0aee30d33ded905415918462b832004b68bd"}, {"name":"gitlab_chronic_duration","version":"0.12.0","platform":"ruby","checksum":"0d766944d415b5c831f176871ee8625783fc0c5bfbef2d79a3a616f207ffc16d"}, {"name":"gitlab_omniauth-ldap","version":"2.2.0","platform":"ruby","checksum":"bb4d20acb3b123ed654a8f6a47d3fac673ece7ed0b6992edb92dca14bad2838c"}, -{"name":"gitlab_quality-test_tooling","version":"2.1.0","platform":"ruby","checksum":"834bb046677926399170946004debc0e7da5f4354e08c316c2b7d3f98a74e47c"}, +{"name":"gitlab_quality-test_tooling","version":"2.2.0","platform":"ruby","checksum":"d8fdaa7e5b529d0157485db4c81876a492303b53f30d9e8246f91f37f689295a"}, {"name":"globalid","version":"1.1.0","platform":"ruby","checksum":"b337e1746f0c8cb0a6c918234b03a1ddeb4966206ce288fbb57779f59b2d154f"}, {"name":"gon","version":"6.4.0","platform":"ruby","checksum":"e3a618d659392890f1aa7db420f17c75fd7d35aeb5f8fe003697d02c4b88d2f0"}, {"name":"google-apis-androidpublisher_v3","version":"0.34.0","platform":"ruby","checksum":"d7e1d7dd92f79c498fe2082222a1740d788e022e660c135564b3fd299cab5425"}, @@ -401,7 +401,7 @@ {"name":"mixlib-shellout","version":"3.2.7","platform":"ruby","checksum":"46f6d1f9c77e689a443081c5cac336203343f0f2224db06b80d39ae4cd797c7e"}, {"name":"mixlib-shellout","version":"3.2.7","platform":"universal-mingw32","checksum":"4d7bea07e347cc8de2b4bc22f4d8f84d7bb8165cf900d26b532d0d9fa4928a19"}, {"name":"mixlib-shellout","version":"3.2.7","platform":"x64-mingw-ucrt","checksum":"de01743f678b66c275ea5f40749cde6c056651d1bb6d320711779394d2eec654"}, -{"name":"mize","version":"0.6.0","platform":"ruby","checksum":"3f1a0f52cb5c158e43e93a6dd3be896d9c7dd345d76eb1bd9f26088681db2363"}, +{"name":"mize","version":"0.6.1","platform":"ruby","checksum":"4031558979ff5426fda24c75a149b4e4c0faf4cacf2fae8938f83866ab94b780"}, {"name":"msgpack","version":"1.5.4","platform":"java","checksum":"05b3bd16a65dddc64c878634b7ecb9cd613569ca3dd6e480d7295626a0a3f562"}, {"name":"msgpack","version":"1.5.4","platform":"ruby","checksum":"a53db320fba40f58c07c5b66ed9fd4d73cbe8eba4cb28fe9e3218444341a4e09"}, {"name":"multi_json","version":"1.14.1","platform":"ruby","checksum":"d971296c0eacea289d31e4a7ab7ac5eda97262c62bbc8c110de4f5e36425c577"}, diff --git a/Gemfile.next.lock b/Gemfile.next.lock index 0f6f23da253..be5a505a2de 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -799,7 +799,7 @@ GEM omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (2.1.0) + gitlab_quality-test_tooling (2.2.0) activesupport (>= 7.0, < 7.2) amatch (~> 0.4.1) fog-google (~> 1.24, >= 1.24.1) @@ -1174,7 +1174,7 @@ GEM mixlib-log (3.0.9) mixlib-shellout (3.2.7) chef-utils - mize (0.6.0) + mize (0.6.1) msgpack (1.5.4) multi_json (1.14.1) multi_xml (0.6.0) @@ -2120,7 +2120,7 @@ DEPENDENCIES gitlab-utils! gitlab_chronic_duration (~> 0.12) gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 2.1.0) + gitlab_quality-test_tooling (~> 2.2.0) gon (~> 6.4.0) google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-cloudbilling_v1 (~> 0.21.0) diff --git a/app/assets/javascripts/pages/sessions/new/email_format_validator.js b/app/assets/javascripts/pages/sessions/new/email_format_validator.js index 6dcf3b50dca..9813683bd06 100644 --- a/app/assets/javascripts/pages/sessions/new/email_format_validator.js +++ b/app/assets/javascripts/pages/sessions/new/email_format_validator.js @@ -1,9 +1,8 @@ import InputValidator from '~/validators/input_validator'; -// It checks if email contains at least one character, number or whatever except -// another "@" or whitespace before "@", at least two characters except -// another "@" or whitespace after "@" and one dot in between -const emailRegexPattern = /[^@\s]+@[^@\s]+\.[^@\s]+/; +// The format of the email is validated by the default `type="email"` input field. +// In addition, the email should contain a top-level domain of at least two alphabetical characters. +const emailRegexPattern = /.+\.[a-zA-Z]{2,}/; const hintMessageSelector = '.validation-hint'; const warningMessageSelector = '.validation-warning'; diff --git a/app/assets/javascripts/repository/components/blob_content_viewer.vue b/app/assets/javascripts/repository/components/blob_content_viewer.vue index b1e5afb1ee1..5ce4b9dc45d 100644 --- a/app/assets/javascripts/repository/components/blob_content_viewer.vue +++ b/app/assets/javascripts/repository/components/blob_content_viewer.vue @@ -402,7 +402,7 @@ export default { /> +import { GlIcon, GlTooltip, GlLink } from '@gitlab/ui'; + +export default { + components: { + GlIcon, + GlTooltip, + GlLink, + }, + props: { + itemContent: { + type: Object, + required: true, + }, + }, +}; + + + diff --git a/app/assets/javascripts/work_items/components/work_item_development/work_item_development_relationship_list.vue b/app/assets/javascripts/work_items/components/work_item_development/work_item_development_relationship_list.vue index 42ec0dabfb7..0b869aa90ed 100644 --- a/app/assets/javascripts/work_items/components/work_item_development/work_item_development_relationship_list.vue +++ b/app/assets/javascripts/work_items/components/work_item_development/work_item_development_relationship_list.vue @@ -1,10 +1,12 @@