Download as
Browse Code »

Commit b79d4c9b2875463ab15ec3a3ccbdee3b0a7e29fd

Authored by Dmitriy Zaporozhets
2 parents 7e9e894d e2e11670
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

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