Merge branch 'improve/repo_head_update'

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/project.rb
This commit is contained in:
Dmitriy Zaporozhets 2013-12-16 21:30:24 +02:00
commit 80c4657fa7
No known key found for this signature in database
GPG key ID: 627C5F589F467F17
2 changed files with 6 additions and 7 deletions

View file

@ -10,13 +10,7 @@ module Projects
new_branch = params[:project].delete(:default_branch)
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
project.change_head(new_branch)
end
project.update_attributes(params[:project], as: role)

View file

@ -482,4 +482,9 @@ class Project < ActiveRecord::Base
def unarchive!
update_attribute(:archived, false)
end
def change_head(branch)
gitlab_shell.update_repository_head(self.path_with_namespace, branch)
reload_default_branch
end
end