diff options
| author | Saito <saitowu@gmail.com> | 2011-11-18 20:58:25 +0800 |
|---|---|---|
| committer | Saito <saitowu@gmail.com> | 2011-11-18 20:58:25 +0800 |
| commit | baa4fc8c1797bfb73ea5f59588fc0f61640689c5 (patch) | |
| tree | 7c09fe8d004c9d2ea9a137d7c4799cc5b61a105d | |
| parent | 6bd9b90fb6c59282d741964707e3e8461232038a (diff) | |
| parent | ccefc95e125534cf237e015c7dd78f465a966e47 (diff) | |
| download | gitlab-ce-baa4fc8c1797bfb73ea5f59588fc0f61640689c5.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -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 712c7aecb26..8967859d089 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 226365775da..4e1f130887e 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) # |