diff options
| author | Nihad Abbasov <narkoz.2008@gmail.com> | 2011-11-16 09:50:05 -0800 |
|---|---|---|
| committer | Nihad Abbasov <narkoz.2008@gmail.com> | 2011-11-16 09:50:05 -0800 |
| commit | c4a575b70b3ee8a25023dd1b4eb2422c54f6b04d (patch) | |
| tree | d883210fc4780838158b68fd4660f24bfe01469f | |
| parent | 79bcdfb8d7643e26fb93e234eaf3bc83332367dc (diff) | |
| parent | 7b5fd145157e1eae18d2721d75330404acc92963 (diff) | |
| download | gitlab-ce-c4a575b70b3ee8a25023dd1b4eb2422c54f6b04d.tar.gz | |
Merge pull request #105 from SaitoWu/annotate
annotate models
| -rw-r--r-- | app/models/issue.rb | 5 | ||||
| -rw-r--r-- | app/models/user.rb | 9 | ||||
| -rw-r--r-- | spec/models/issue_spec.rb | 1 | ||||
| -rw-r--r-- | spec/models/user_spec.rb | 9 |
4 files changed, 10 insertions, 14 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb index ac921d7f675..2a880037091 100644 --- a/app/models/issue.rb +++ b/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 diff --git a/app/models/user.rb b/app/models/user.rb index f6c271467dd..13704a92267 100644 --- a/app/models/user.rb +++ b/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) # diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb index da2d88f67f8..ac6786333d1 100644 --- a/spec/models/issue_spec.rb +++ b/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 diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index a22aee75b0d..45aff2bd00c 100644 --- a/spec/models/user_spec.rb +++ b/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) # |