Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
a0758760fc92
Commit
dbfe8597
authored
Sep 29, 2017
by
Valery Sizov
Browse files
[Backport Semi-linear history] Update Project#ff_merge_must_be_possible? method
parent
9d1294f10708
Changes
1
Show whitespace changes
Inline
Side-by-side
app/models/project.rb
View file @
a0758760
...
...
@@ -1589,7 +1589,7 @@ def merge_method=(method)
end
def
ff_merge_must_be_possible?
self
.
merge_requests_ff_only_enabled
self
.
merge_requests_ff_only_enabled
||
self
.
merge_requests_rebase_enabled
end
def
migrate_to_hashed_storage!
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment