Download as
Browse Code »

Commit ccefc95e125534cf237e015c7dd78f465a966e47

Authored by gitlabhq
2 parents 91d5a906 c4a575b7
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Showing 4 changed files with 10 additions and 14 deletions   Show diff stats
app/models/issue.rb
  Diff comments   View file @ccefc95
@@ -19,10 +19,6 @@ class Issue < ActiveRecord::Base @@ -19,10 +19,6 @@ class Issue < ActiveRecord::Base
19 :presence => true, 19 :presence => true,
20 :length => { :within => 0..255 } 20 :length => { :within => 0..255 }
21 21
22 - #validates :content,  
23 - #:presence => true,  
24 - #:length => { :within => 0..2000 }  
25 -  
26 scope :critical, where(:critical => true) 22 scope :critical, where(:critical => true)
27 scope :non_critical, where(:critical => false) 23 scope :non_critical, where(:critical => false)
28 24
@@ -46,7 +42,6 @@ end @@ -46,7 +42,6 @@ end
46 # 42 #
47 # id :integer not null, primary key 43 # id :integer not null, primary key
48 # title :string(255) 44 # title :string(255)
49 -# content :text  
50 # assignee_id :integer 45 # assignee_id :integer
51 # author_id :integer 46 # author_id :integer
52 # project_id :integer 47 # project_id :integer
app/models/user.rb
  Diff comments   View file @ccefc95
@@ -64,9 +64,10 @@ end @@ -64,9 +64,10 @@ end
64 # updated_at :datetime 64 # updated_at :datetime
65 # name :string(255) 65 # name :string(255)
66 # admin :boolean default(FALSE), not null 66 # admin :boolean default(FALSE), not null
67 -# projects_limit :integer  
68 -# skype :string  
69 -# linkedin :string  
70 -# twitter :string 67 +# projects_limit :integer default(10)
  68 +# skype :string(255) default(""), not null
  69 +# linkedin :string(255) default(""), not null
  70 +# twitter :string(255) default(""), not null
  71 +# authentication_token :string(255)
71 # 72 #
72 73
spec/models/issue_spec.rb
  Diff comments   View file @ccefc95
@@ -31,7 +31,6 @@ end @@ -31,7 +31,6 @@ end
31 # 31 #
32 # id :integer not null, primary key 32 # id :integer not null, primary key
33 # title :string(255) 33 # title :string(255)
34 -# content :text  
35 # assignee_id :integer 34 # assignee_id :integer
36 # author_id :integer 35 # author_id :integer
37 # project_id :integer 36 # project_id :integer
spec/models/user_spec.rb
  Diff comments   View file @ccefc95
@@ -58,9 +58,10 @@ end @@ -58,9 +58,10 @@ end
58 # updated_at :datetime 58 # updated_at :datetime
59 # name :string(255) 59 # name :string(255)
60 # admin :boolean default(FALSE), not null 60 # admin :boolean default(FALSE), not null
61 -# projects_limit :integer  
62 -# skype :string  
63 -# linkedin :string  
64 -# twitter :string 61 +# projects_limit :integer default(10)
  62 +# skype :string(255) default(""), not null
  63 +# linkedin :string(255) default(""), not null
  64 +# twitter :string(255) default(""), not null
  65 +# authentication_token :string(255)
65 # 66 #
66 67