Reannotated

diff --git a/app/models/group.rb b/app/models/group.rb
index ab7b1b8..66267c5 100644 (file)
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -1,13 +1,14 @@
 # == 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

diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 72ba106..742c5cd 100644 (file)
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -1,3 +1,16 @@
+# == 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
 

diff --git a/app/models/project.rb b/app/models/project.rb
index 956ab2a..4125456 100644 (file)
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -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"

diff --git a/app/models/user.rb b/app/models/user.rb
index 20a5c47..bd7f50e 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -30,6 +30,7 @@
 #  locked_at              :datetime
 #  extern_uid             :string(255)
 #  provider               :string(255)
+#  username               :string(255)
 #
 
 class User < ActiveRecord::Base

diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 3a748b8..8058324 100644 (file)
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -1,13 +1,14 @@
 # == 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'

diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb
index f481363..c2509d2 100644 (file)
--- a/spec/models/namespace_spec.rb
+++ b/spec/models/namespace_spec.rb
@@ -1,3 +1,16 @@
+# == 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

diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 74c0aed..4fb5f50 100644 (file)
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -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'

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 3a87499..13fa4d1 100644 (file)
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -30,6 +30,7 @@
 #  locked_at              :datetime
 #  extern_uid             :string(255)
 #  provider               :string(255)
+#  username               :string(255)
 #
 
 require 'spec_helper'

diff --git a/spec/support/namespaces_stub.rb b/spec/support/namespaces_stub.rb
index 35754f5..9cf9946 100644 (file)
--- a/spec/support/namespaces_stub.rb
+++ b/spec/support/namespaces_stub.rb
@@ -5,6 +5,10 @@ class Namespace
   def ensure_dir_exist
     true
   end
+
+  def move_dir
+    true
+  end
 end
 
 class Gitlab::ProjectMover