diff options
Diffstat (limited to 'app/models/concerns/has_repository.rb')
| -rw-r--r-- | app/models/concerns/has_repository.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/concerns/has_repository.rb b/app/models/concerns/has_repository.rb index eccf21551f0..978a54bdee7 100644 --- a/app/models/concerns/has_repository.rb +++ b/app/models/concerns/has_repository.rb @@ -84,7 +84,11 @@ module HasRepository end def default_branch_from_preferences - empty_repo? ? Gitlab::CurrentSettings.default_branch_name : nil + return unless empty_repo? + + group_branch_default_name = group&.default_branch_name if respond_to?(:group) + + group_branch_default_name || Gitlab::CurrentSettings.default_branch_name end def reload_default_branch |