Commit 4d137421 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 6a919505 88a12332
......@@ -1077,7 +1077,7 @@ class Repository
end
def rebase(user, merge_request)
if Feature.disabled?(:two_step_rebase, default_enabled: false)
if Feature.disabled?(:two_step_rebase, default_enabled: true)
return rebase_deprecated(user, merge_request)
end
......
---
title: Disable two-step rebase which could cause rebases to hang
merge_request: 28778
author:
type: other
---
title: Filter relative links in wiki for XSS
merge_request:
author:
type: security
---
title: Stop two-step rebase from hanging when errors occur
merge_request: 29068
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment