Merge branch 'bug/default_branch_cached' of /home/git/repositories/gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents 7e9e894d e2e11670
Showing 2 changed files with 9 additions and 2 deletions Show diff stats
app/contexts/projects/update_context.rb
app/models/project.rb
@@ -5,12 +5,14 @@ module Projects
       params[:project].delete(:public) unless can?(current_user, :change_public_mode, project)
       new_branch = params[:project].delete(:default_branch)
-      if project.repository.exists? && new_branch != project.repository.root_ref
+      if project.repository.exists? && new_branch != project.default_branch
         GitlabShellWorker.perform_async(
           :update_repository_head,
           project.path_with_namespace,
           new_branch
         )
+
+        project.reload_default_branch
       end
       project.update_attributes(params[:project], as: role)
@@ -26,7 +26,7 @@
 class Project < ActiveRecord::Base
   include Gitlab::ShellAdapter
   extend Enumerize
-   
+
   ActsAsTaggableOn.strict_case_match = true
   attr_accessible :name, :path, :description, :issues_tracker, :label_list,
@@ -451,4 +451,9 @@ class Project &lt; ActiveRecord::Base
   def default_branch
     @default_branch ||= repository.root_ref if repository.exists?
   end
+
+  def reload_default_branch
+    @default_branch = nil
+    default_branch
+  end
 end