Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq into...

Conflicts:
	db/schema.rb

diff --cc db/schema.rb
index e9d428e,e0ad829..3eb3a7d
--- 1/db/schema.rb
--- 2/db/schema.rb
+++ b/db/schema.rb
@@@ -106,12 -106,13 +106,13 @@@ ActiveRecord::Schema.define(:version =
    add_index "milestones", ["project_id"], :name => "index_milestones_on_project_id"
  
    create_table "namespaces", :force => true do |t|
 -    t.string   "name",                        :null => false
 -    t.string   "path",                        :null => false
 -    t.integer  "owner_id",                    :null => false
 -    t.datetime "created_at",                  :null => false
 -    t.datetime "updated_at",                  :null => false
 +    t.string   "name",       :null => false
 +    t.string   "path",       :null => false
 +    t.integer  "owner_id",   :null => false
 +    t.datetime "created_at", :null => false
 +    t.datetime "updated_at", :null => false
      t.string   "type"
+     t.string   "description", :default => "", :null => false
    end
  
    add_index "namespaces", ["name"], :name => "index_namespaces_on_name"
@@@ -142,18 -143,16 +143,18 @@@
      t.string   "name"
      t.string   "path"
      t.text     "description"
-     t.datetime "created_at",                                   :null => false
-     t.datetime "updated_at",                                   :null => false
+     t.datetime "created_at",                                :null => false
+     t.datetime "updated_at",                                :null => false
      t.integer  "creator_id"
      t.string   "default_branch"
-     t.boolean  "issues_enabled",         :default => true,     :null => false
-     t.boolean  "wall_enabled",           :default => true,     :null => false
-     t.boolean  "merge_requests_enabled", :default => true,     :null => false
-     t.boolean  "wiki_enabled",           :default => true,     :null => false
+     t.boolean  "issues_enabled",         :default => true,  :null => false
+     t.boolean  "wall_enabled",           :default => true,  :null => false
+     t.boolean  "merge_requests_enabled", :default => true,  :null => false
+     t.boolean  "wiki_enabled",           :default => true,  :null => false
      t.integer  "namespace_id"
 -    t.boolean  "public",                 :default => false, :null => false
 +    t.boolean  "public",                 :default => false,    :null => false
 +    t.string   "issues_tracker",         :default => "gitlab", :null => false
 +    t.string   "issues_tracker_id"
    end
  
    add_index "projects", ["creator_id"], :name => "index_projects_on_owner_id"
@@@ -232,8 -231,9 +233,14 @@@
      t.string   "name"
      t.string   "path"
      t.integer  "owner_id"
++<<<<<<< HEAD
 +    t.datetime "created_at", :null => false
 +    t.datetime "updated_at", :null => false
++=======
+     t.datetime "created_at",                  :null => false
+     t.datetime "updated_at",                  :null => false
+     t.string   "description", :default => "", :null => false
++>>>>>>> 2f1f05d431d1df062e46365930b98b358554a07d
    end
  
    create_table "users", :force => true do |t|

diff --cc features/steps/group/group.rb
Simple merge