deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Saito 2011-11-18 20:58:25 +08:00
parent 6bd9b90fb6 ccefc95e12
commit baa4fc8c17
4 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/models/issue.rb
View file

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

9
app/models/user.rb
View file

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

1
spec/models/issue_spec.rb
View file

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

9
spec/models/user_spec.rb
View file

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