From 2b7dd017af7de4d09ef3a1cd835e8d07c8800b6a Mon Sep 17 00:00:00 2001 From: Luke Duncalfe Date: Wed, 6 Feb 2019 12:33:11 +0000 Subject: Allow custom squash commit messages --- app/models/commit.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/commit.rb') diff --git a/app/models/commit.rb b/app/models/commit.rb index 982e13e2845..f412d252e5c 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -379,7 +379,7 @@ class Commit end def merge_commit? - parents.size > 1 + parent_ids.size > 1 end def merged_merge_request(current_user) -- cgit v1.2.1