Skip to content

Revert "Merge branch 'unresolved-threads-updates' into 'master'"

Kyle Wiebers requested to merge revert-17adae2f into master

What does this MR do and why?

Describe in detail what your merge request does and why.

Reverts !97860 (merged) because it seems to be causing #376035 (comment 1120697204)

More details on why this happened in #376035 (comment 1120748458)

Screenshots or screen recordings

Screenshots are required for UI changes, and strongly recommended for all other merge requests.

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

bundle exec rspec ee/spec/features/merge_request/user_merges_with_push_rules_spec.rb ee/spec/features/merge_request/user_views_blocked_merge_request_spec.rb spec/features/merge_request/user_merges_only_if_pipeline_succeeds_spec.rb spec/features/merge_request/user_sees_merge_widget_spec.rb spec/features/merge_request/user_accepts_merge_request_spec.rb spec/features/user_sees_revert_modal_spec.rb spec/features/merge_request/user_reverts_merge_request_spec.rb spec/features/merge_request/user_sees_merge_button_depending_on_unresolved_discussions_spec.rb against this branch should pass instead of fail like https://gitlab.com/gitlab-org/gitlab/-/jobs/3109717599

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Edited by Kyle Wiebers

Merge request reports