Commit b79d4c9b2875463ab15ec3a3ccbdee3b0a7e29fd

Authored by Dmitriy Zaporozhets
2 parents 7e9e894d e2e11670

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

app/contexts/projects/update_context.rb
@@ -5,12 +5,14 @@ module Projects @@ -5,12 +5,14 @@ module Projects
5 params[:project].delete(:public) unless can?(current_user, :change_public_mode, project) 5 params[:project].delete(:public) unless can?(current_user, :change_public_mode, project)
6 new_branch = params[:project].delete(:default_branch) 6 new_branch = params[:project].delete(:default_branch)
7 7
8 - if project.repository.exists? && new_branch != project.repository.root_ref 8 + if project.repository.exists? && new_branch != project.default_branch
9 GitlabShellWorker.perform_async( 9 GitlabShellWorker.perform_async(
10 :update_repository_head, 10 :update_repository_head,
11 project.path_with_namespace, 11 project.path_with_namespace,
12 new_branch 12 new_branch
13 ) 13 )
  14 +
  15 + project.reload_default_branch
14 end 16 end
15 17
16 project.update_attributes(params[:project], as: role) 18 project.update_attributes(params[:project], as: role)
app/models/project.rb
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 class Project < ActiveRecord::Base 26 class Project < ActiveRecord::Base
27 include Gitlab::ShellAdapter 27 include Gitlab::ShellAdapter
28 extend Enumerize 28 extend Enumerize
29 - 29 +
30 ActsAsTaggableOn.strict_case_match = true 30 ActsAsTaggableOn.strict_case_match = true
31 31
32 attr_accessible :name, :path, :description, :issues_tracker, :label_list, 32 attr_accessible :name, :path, :description, :issues_tracker, :label_list,
@@ -451,4 +451,9 @@ class Project &lt; ActiveRecord::Base @@ -451,4 +451,9 @@ class Project &lt; ActiveRecord::Base
451 def default_branch 451 def default_branch
452 @default_branch ||= repository.root_ref if repository.exists? 452 @default_branch ||= repository.root_ref if repository.exists?
453 end 453 end
  454 +
  455 + def reload_default_branch
  456 + @default_branch = nil
  457 + default_branch
  458 + end
454 end 459 end