Commit ce0102d8 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Remove dependecy on `User`

parent 99a03fd6
...@@ -30,26 +30,8 @@ module Gitlab ...@@ -30,26 +30,8 @@ module Gitlab
def prepare_route def prepare_route
route || build_route(source: self) route || build_route(source: self)
route.path = build_full_path route.path = build_full_path
route.name = build_full_name
@full_path = nil @full_path = nil
@full_name = nil
end end
def build_full_name
if parent && name
parent.human_name + ' / ' + name
else
name
end
end
def human_name
owner&.name
end
end
class User < ActiveRecord::Base
self.table_name = 'users'
end end
class Namespace < ActiveRecord::Base class Namespace < ActiveRecord::Base
...@@ -61,8 +43,6 @@ module Gitlab ...@@ -61,8 +43,6 @@ module Gitlab
has_many :children, has_many :children,
class_name: "#{MigrationClasses.name}::Namespace", class_name: "#{MigrationClasses.name}::Namespace",
foreign_key: :parent_id foreign_key: :parent_id
belongs_to :owner,
class_name: "#{MigrationClasses.name}::User"
# Overridden to have the correct `source_type` for the `route` relation # Overridden to have the correct `source_type` for the `route` relation
def self.name def self.name
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment