Merge branch 'master' of github.com:gitlabhq/gitlabhq

app/models/issue.rb

@@ -19,10 +19,6 @@ class Issue < ActiveRecord::Base
             :presence => true,
             :length   => { :within => 0..255 }
 
-  #validates :content,
-            #:presence => true,
-            #:length   => { :within => 0..2000 }
-
   scope :critical, where(:critical => true)
   scope :non_critical, where(:critical => false)
 
@@ -46,7 +42,6 @@ end
 #
 #  id          :integer         not null, primary key
 #  title       :string(255)
-#  content     :text
 #  assignee_id :integer
 #  author_id   :integer
 #  project_id  :integer

app/models/user.rb

@@ -64,9 +64,10 @@ end
 #  updated_at             :datetime
 #  name                   :string(255)
 #  admin                  :boolean         default(FALSE), not null
-#  projects_limit         :integer
-#  skype                  :string
-#  linkedin               :string
-#  twitter                :string
+#  projects_limit         :integer         default(10)
+#  skype                  :string(255)     default(""), not null
+#  linkedin               :string(255)     default(""), not null
+#  twitter                :string(255)     default(""), not null
+#  authentication_token   :string(255)
 #
 

spec/models/issue_spec.rb

@@ -31,7 +31,6 @@ end
 #
 #  id          :integer         not null, primary key
 #  title       :string(255)
-#  content     :text
 #  assignee_id :integer
 #  author_id   :integer
 #  project_id  :integer

spec/models/user_spec.rb

@@ -58,9 +58,10 @@ end
 #  updated_at             :datetime
 #  name                   :string(255)
 #  admin                  :boolean         default(FALSE), not null
-#  projects_limit         :integer
-#  skype                  :string
-#  linkedin               :string
-#  twitter                :string
+#  projects_limit         :integer         default(10)
+#  skype                  :string(255)     default(""), not null
+#  linkedin               :string(255)     default(""), not null
+#  twitter                :string(255)     default(""), not null
+#  authentication_token   :string(255)
 #