diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-28 15:13:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-28 15:13:55 +0300 |
commit | f9ebf09112cb8df46f1c54b4ed6fdd8c33ea71ef (patch) | |
tree | 1bb0dc863174e7763a80852cc7cf41bc9d9991fd | |
parent | a325d3a2c05b8f664a76912c5ac32d0a8e45e562 (diff) |
Add latest changes from gitlab-org/security/gitlab@16-1-stable-ee
-rw-r--r-- | .rubocop_todo/gitlab/strong_memoize_attr.yml | 1 | ||||
-rw-r--r-- | .rubocop_todo/rspec/missing_feature_category.yml | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/.rubocop_todo/gitlab/strong_memoize_attr.yml b/.rubocop_todo/gitlab/strong_memoize_attr.yml index a6c273cc85b..62457a0108e 100644 --- a/.rubocop_todo/gitlab/strong_memoize_attr.yml +++ b/.rubocop_todo/gitlab/strong_memoize_attr.yml @@ -329,7 +329,6 @@ Gitlab/StrongMemoizeAttr: - 'ee/app/models/vulnerabilities/finding.rb' - 'ee/app/presenters/approval_rule_presenter.rb' - 'ee/app/presenters/ci/minutes/usage_presenter.rb' - - 'ee/app/presenters/merge_request_approver_presenter.rb' - 'ee/app/serializers/dashboard_operations_project_entity.rb' - 'ee/app/serializers/ee/member_user_entity.rb' - 'ee/app/services/app_sec/dast/pipelines/find_latest_service.rb' diff --git a/.rubocop_todo/rspec/missing_feature_category.yml b/.rubocop_todo/rspec/missing_feature_category.yml index 0835191b8f4..1f90a4c3ba5 100644 --- a/.rubocop_todo/rspec/missing_feature_category.yml +++ b/.rubocop_todo/rspec/missing_feature_category.yml @@ -1011,7 +1011,6 @@ RSpec/MissingFeatureCategory: - 'ee/spec/models/approval_merge_request_rule_spec.rb' - 'ee/spec/models/approval_state_spec.rb' - 'ee/spec/models/approval_wrapped_any_approver_rule_spec.rb' - - 'ee/spec/models/approval_wrapped_code_owner_rule_spec.rb' - 'ee/spec/models/approval_wrapped_rule_spec.rb' - 'ee/spec/models/approvals/scan_finding_wrapped_rule_set_spec.rb' - 'ee/spec/models/approvals/wrapped_rule_set_spec.rb' |