Commit 65c470e84396a9db4b697a45128ce8d28c612d7c

Authored by Dmitriy Zaporozhets
1 parent 3f1d6d6a

Reannotated

app/models/group.rb
1 # == Schema Information 1 # == Schema Information
2 # 2 #
3 -# Table name: groups 3 +# Table name: namespaces
4 # 4 #
5 # id :integer not null, primary key 5 # id :integer not null, primary key
6 # name :string(255) not null 6 # name :string(255) not null
7 -# code :string(255) not null 7 +# path :string(255) not null
8 # owner_id :integer not null 8 # owner_id :integer not null
9 # created_at :datetime not null 9 # created_at :datetime not null
10 # updated_at :datetime not null 10 # updated_at :datetime not null
  11 +# type :string(255)
11 # 12 #
12 13
13 class Group < Namespace 14 class Group < Namespace
app/models/namespace.rb
  1 +# == Schema Information
  2 +#
  3 +# Table name: namespaces
  4 +#
  5 +# id :integer not null, primary key
  6 +# name :string(255) not null
  7 +# path :string(255) not null
  8 +# owner_id :integer not null
  9 +# created_at :datetime not null
  10 +# updated_at :datetime not null
  11 +# type :string(255)
  12 +#
  13 +
1 class Namespace < ActiveRecord::Base 14 class Namespace < ActiveRecord::Base
2 attr_accessible :name, :path 15 attr_accessible :name, :path
3 16
app/models/project.rb
@@ -9,14 +9,13 @@ @@ -9,14 +9,13 @@
9 # created_at :datetime not null 9 # created_at :datetime not null
10 # updated_at :datetime not null 10 # updated_at :datetime not null
11 # private_flag :boolean default(TRUE), not null 11 # private_flag :boolean default(TRUE), not null
12 -# code :string(255)  
13 # owner_id :integer 12 # owner_id :integer
14 # default_branch :string(255) 13 # default_branch :string(255)
15 # issues_enabled :boolean default(TRUE), not null 14 # issues_enabled :boolean default(TRUE), not null
16 # wall_enabled :boolean default(TRUE), not null 15 # wall_enabled :boolean default(TRUE), not null
17 # merge_requests_enabled :boolean default(TRUE), not null 16 # merge_requests_enabled :boolean default(TRUE), not null
18 # wiki_enabled :boolean default(TRUE), not null 17 # wiki_enabled :boolean default(TRUE), not null
19 -# group_id :integer 18 +# namespace_id :integer
20 # 19 #
21 20
22 require "grit" 21 require "grit"
app/models/user.rb
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
30 # locked_at :datetime 30 # locked_at :datetime
31 # extern_uid :string(255) 31 # extern_uid :string(255)
32 # provider :string(255) 32 # provider :string(255)
  33 +# username :string(255)
33 # 34 #
34 35
35 class User < ActiveRecord::Base 36 class User < ActiveRecord::Base
spec/models/group_spec.rb
1 # == Schema Information 1 # == Schema Information
2 # 2 #
3 -# Table name: groups 3 +# Table name: namespaces
4 # 4 #
5 # id :integer not null, primary key 5 # id :integer not null, primary key
6 # name :string(255) not null 6 # name :string(255) not null
7 -# code :string(255) not null 7 +# path :string(255) not null
8 # owner_id :integer not null 8 # owner_id :integer not null
9 # created_at :datetime not null 9 # created_at :datetime not null
10 # updated_at :datetime not null 10 # updated_at :datetime not null
  11 +# type :string(255)
11 # 12 #
12 13
13 require 'spec_helper' 14 require 'spec_helper'
spec/models/namespace_spec.rb
  1 +# == Schema Information
  2 +#
  3 +# Table name: namespaces
  4 +#
  5 +# id :integer not null, primary key
  6 +# name :string(255) not null
  7 +# path :string(255) not null
  8 +# owner_id :integer not null
  9 +# created_at :datetime not null
  10 +# updated_at :datetime not null
  11 +# type :string(255)
  12 +#
  13 +
1 require 'spec_helper' 14 require 'spec_helper'
2 15
3 describe Namespace do 16 describe Namespace do
spec/models/project_spec.rb
@@ -9,14 +9,13 @@ @@ -9,14 +9,13 @@
9 # created_at :datetime not null 9 # created_at :datetime not null
10 # updated_at :datetime not null 10 # updated_at :datetime not null
11 # private_flag :boolean default(TRUE), not null 11 # private_flag :boolean default(TRUE), not null
12 -# code :string(255)  
13 # owner_id :integer 12 # owner_id :integer
14 # default_branch :string(255) 13 # default_branch :string(255)
15 # issues_enabled :boolean default(TRUE), not null 14 # issues_enabled :boolean default(TRUE), not null
16 # wall_enabled :boolean default(TRUE), not null 15 # wall_enabled :boolean default(TRUE), not null
17 # merge_requests_enabled :boolean default(TRUE), not null 16 # merge_requests_enabled :boolean default(TRUE), not null
18 # wiki_enabled :boolean default(TRUE), not null 17 # wiki_enabled :boolean default(TRUE), not null
19 -# group_id :integer 18 +# namespace_id :integer
20 # 19 #
21 20
22 require 'spec_helper' 21 require 'spec_helper'
spec/models/user_spec.rb
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
30 # locked_at :datetime 30 # locked_at :datetime
31 # extern_uid :string(255) 31 # extern_uid :string(255)
32 # provider :string(255) 32 # provider :string(255)
  33 +# username :string(255)
33 # 34 #
34 35
35 require 'spec_helper' 36 require 'spec_helper'
spec/support/namespaces_stub.rb
@@ -5,6 +5,10 @@ class Namespace @@ -5,6 +5,10 @@ class Namespace
5 def ensure_dir_exist 5 def ensure_dir_exist
6 true 6 true
7 end 7 end
  8 +
  9 + def move_dir
  10 + true
  11 + end
8 end 12 end
9 13
10 class Gitlab::ProjectMover 14 class Gitlab::ProjectMover