deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed and improved enable_naamespace migration task

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-12-28 06:14:05 +03:00
parent 779e95b503
commit 708a0d421e
3 changed files with 84 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/models/namespace.rb
View file

@ -51,8 +51,17 @@ class Namespace < ActiveRecord::Base
end
def ensure_dir_exist
namespace_dir_path = File.join(Gitlab.config.gitolite.repos_path, path)
system("mkdir -m 770 #{namespace_dir_path}") unless File.exists?(namespace_dir_path)
unless dir_exists?
system("mkdir -m 770 #{namespace_full_path}")
end
end
def dir_exists?
File.exists?(namespace_full_path)
end
def namespace_full_path
@namespace_full_path ||= File.join(Gitlab.config.gitolite.repos_path, path)
end
def move_dir

2
app/observers/user_observer.rb
View file

@ -14,7 +14,7 @@ class UserObserver < ActiveRecord::Observer
if user.namespace
user.namespace.update_attributes(path: user.username)
else
user.create_namespace!(path: user.username, name: user.name)
user.create_namespace!(path: user.username, name: user.username)
end
end
end