rebase_service_spec master failure
Job #213531070 failed for 71421729:
https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/213531070
Failed examples:
rspec './spec/services/merge_requests/rebase_service_spec.rb[1:1:3:1:1]' # MergeRequests::RebaseService#execute with deprecated step rebase feature behaves like sequence of failure and success properly clears the error message
Failures:
1) MergeRequests::RebaseService#execute with deprecated step rebase feature behaves like sequence of failure and success properly clears the error message
Failure/Error: merge_request.update(merge_error: message) if save_message_on_model
#<Feature (class)> received :disabled? with unexpected arguments
expected: (:two_step_rebase, anything)
got: (:approval_rules, #<Project id:135 namespace132/project130>, {:default_enabled=>true})
Diff:
@@ -1,2 +1,4 @@
-[:two_step_rebase, "anything"]
+[:approval_rules,
+ #<Project id:135 namespace132/project130>,
+ {:default_enabled=>true}]