Merge branch 'rs-fix-user-namespace_uniq' into 'master'

Properly check for a pre-existing error in `User#namespace_uniq` Rails adds an empty error to the Errors object even if you just call `#[]` on it: ``` [1] pry(main)> u = User.last [2] pry(main)> u.errors.keys => [] [3] pry(main)> u.errors[:username].present? => false [4] pry(main)> u.errors.keys => [:username] ``` See merge request !3017

Merge branch 'rs-fix-user-namespace_uniq' into 'master'
acd98810 · Douwe Maan · 204a9895 · 128757a7 · acd98810
Commit acd98810 authored Mar 01, 2016 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

user.rb app/models/user.rb +2 -1

No files found.
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -373,7 +373,8 @@ class User < ActiveRecord::Base
  def namespace_uniq
    # Return early if username already failed the first uniqueness validation
-    return if self.errors[:username].include?('has already been taken')
+    return if self.errors.key?(:username) &&
+      self.errors[:username].include?('has already been taken')
    namespace_name = self.username
    existing_namespace = Namespace.by_path(namespace_name)