Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 6 deletions

diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 2adcdb0598a..197bd420295 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -504,12 +504,12 @@ module API
 
     def render_validation_error!(model, status = 400)
       if model.errors.any?
-        render_api_error!(model_error_messages(model) || '400 Bad Request', status)
+        render_api_error!(model_errors(model).messages || '400 Bad Request', status)
       end
     end
 
-    def model_error_messages(model)
-      model.errors.messages
+    def model_errors(model)
+      model.errors
     end
 
     def render_api_error_with_reason!(status, message, reason)
diff --git a/lib/api/helpers/users_helpers.rb b/lib/api/helpers/users_helpers.rb
index e80b89488a2..f97071d9a97 100644
--- a/lib/api/helpers/users_helpers.rb
+++ b/lib/api/helpers/users_helpers.rb
@@ -12,10 +12,14 @@ module API
       params :optional_index_params_ee do
       end
 
-      def model_error_messages(model)
-        super.tap do |error_messages|
+      def model_errors(model)
+        super.tap do |errors|
           # Remapping errors from nested associations.
-          error_messages[:bio] = error_messages.delete(:"user_detail.bio") if error_messages.has_key?(:"user_detail.bio")
+          next unless errors.has_key?(:"user_detail.bio")
+
+          errors.delete(:"user_detail.bio").each do |message|
+            errors.add(:bio, message)
+          end
         end
       end