Download as
Browse Code »

Commit b48852e78901e3ce3fdc6449c4dc67d01b30f0ca

Authored by Valeriy Sizov
2 parents bca7bddd 63d9373a
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #2261 from jouve/fix_user_validation 

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