From d0a95c30b9246bd5914f47f2d644c7c16c43fe7d Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 15 Aug 2013 12:27:19 +0300 Subject: [PATCH] Ensure project discover default branch on Project#show --- app/controllers/projects_controller.rb | 4 ++++ app/models/project.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 34b1d708ba7..9e88d0b4757 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -57,6 +57,10 @@ class ProjectsController < Projects::ApplicationController limit = (params[:limit] || 20).to_i @events = @project.events.recent.limit(limit).offset(params[:offset] || 0) + # Ensure project default branch is set if it possible + # Normally it defined on push or during creation + @project.discover_default_branch + respond_to do |format| format.html do if @project.empty_repo? diff --git a/app/models/project.rb b/app/models/project.rb index 8f9464b5652..de77bf1c666 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -312,7 +312,7 @@ class Project < ActiveRecord::Base def discover_default_branch # Discover the default branch, but only if it hasn't already been set to # something else - if repository && default_branch.nil? + if repository.exists? && default_branch.nil? update_attributes(default_branch: self.repository.discover_default_branch) end end