Commit b48852e78901e3ce3fdc6449c4dc67d01b30f0ca

Authored by Valeriy Sizov
2 parents bca7bddd 63d9373a

Merge pull request #2261 from jouve/fix_user_validation

Validates presence of User#name
app/models/user.rb
@@ -62,6 +62,7 @@ class User < ActiveRecord::Base @@ -62,6 +62,7 @@ class User < ActiveRecord::Base
62 has_many :assigned_issues, class_name: "Issue", foreign_key: :assignee_id, dependent: :destroy 62 has_many :assigned_issues, class_name: "Issue", foreign_key: :assignee_id, dependent: :destroy
63 has_many :assigned_merge_requests, class_name: "MergeRequest", foreign_key: :assignee_id, dependent: :destroy 63 has_many :assigned_merge_requests, class_name: "MergeRequest", foreign_key: :assignee_id, dependent: :destroy
64 64
  65 + validates :name, presence: true
65 validates :bio, length: { within: 0..255 } 66 validates :bio, length: { within: 0..255 }
66 validates :extern_uid, allow_blank: true, uniqueness: {scope: :provider} 67 validates :extern_uid, allow_blank: true, uniqueness: {scope: :provider}
67 validates :projects_limit, presence: true, numericality: {greater_than_or_equal_to: 0} 68 validates :projects_limit, presence: true, numericality: {greater_than_or_equal_to: 0}
doc/api/users.md
@@ -75,7 +75,7 @@ POST /users @@ -75,7 +75,7 @@ POST /users
75 Parameters: 75 Parameters:
76 + `email` (required) - Email 76 + `email` (required) - Email
77 + `password` (required) - Password 77 + `password` (required) - Password
78 -+ `name` - Name 78 ++ `name` (required) - Name
79 + `skype` - Skype ID 79 + `skype` - Skype ID
80 + `linkedin` - Linkedin 80 + `linkedin` - Linkedin
81 + `twitter` - Twitter account 81 + `twitter` - Twitter account
lib/api/users.rb
@@ -101,8 +101,6 @@ module Gitlab @@ -101,8 +101,6 @@ module Gitlab
101 key = current_user.keys.find params[:id] 101 key = current_user.keys.find params[:id]
102 key.delete 102 key.delete
103 end 103 end
104 -  
105 -  
106 end 104 end
107 end 105 end
108 end 106 end