Reannotated

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