Merge pull request #2261 from jouve/fix_user_validation

Validates presence of User#name

3 files changed, 2 insertions, 3 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index 3f2d7c92ea8..f99fdd27aed 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -62,6 +62,7 @@ class User < ActiveRecord::Base
   has_many :assigned_issues, class_name: "Issue", foreign_key: :assignee_id, dependent: :destroy
   has_many :assigned_merge_requests, class_name: "MergeRequest", foreign_key: :assignee_id, dependent: :destroy
 
+  validates :name, presence: true
   validates :bio, length: { within: 0..255 }
   validates :extern_uid, allow_blank: true, uniqueness: {scope: :provider}
   validates :projects_limit, presence: true, numericality: {greater_than_or_equal_to: 0}
diff --git a/doc/api/users.md b/doc/api/users.md
index c116144d91e..e5674ab8463 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -75,7 +75,7 @@ POST /users
 Parameters:
 + `email` (required)                  - Email
 + `password` (required)               - Password
-+ `name`                              - Name
++ `name` (required)                   - Name
 + `skype`                             - Skype ID
 + `linkedin`                          - Linkedin
 + `twitter`                           - Twitter account
diff --git a/lib/api/users.rb b/lib/api/users.rb
index cad99fd9f7b..140c20f6bd2 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -101,8 +101,6 @@ module Gitlab
         key = current_user.keys.find params[:id]
         key.delete
       end
-
-
     end
   end
 end