Commit 93ca20fa authored by Eric Eastwood's avatar Eric Eastwood

Removing remaining reference to :fast_forward_merge feature

Otherwise it would throw "invalid project feature :fast_forward_merge"
when visiting `/namespace/repo/edit`
parent a6063ee5
......@@ -461,7 +461,7 @@ module EE
alias_method :merge_requests_rebase_enabled?, :merge_requests_rebase_enabled
def merge_requests_ff_only_enabled
super && feature_available?(:fast_forward_merge)
super
end
alias_method :merge_requests_ff_only_enabled?, :merge_requests_ff_only_enabled
......
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