diff options
| author | Michael Kozono <mkozono@gmail.com> | 2017-08-18 10:31:59 -0700 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2017-08-18 10:31:59 -0700 |
| commit | bd578d96b47c9fadd91fa95a7913bf65f3623128 (patch) | |
| tree | 141200cfc8f89eb63907276d011bfaf4d8ec56a8 /app/models/user.rb | |
| parent | cb1e23758380d035266bbecf87beb24fcc30d23c (diff) | |
| download | gitlab-ce-mk-fix-user-namespace-rename.tar.gz | |
Add namespace errors from User#after_updatemk-fix-user-namespace-rename
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 579ab898784..fbd08bc4d0a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -837,7 +837,12 @@ class User < ActiveRecord::Base create_namespace!(path: username, name: username) unless namespace if username_changed? - namespace.update_attributes!(path: username, name: username) + unless namespace.update_attributes(path: username, name: username) + namespace.errors.each do |attribute, message| + self.errors.add(:"namespace_#{attribute}", message) + end + raise ActiveRecord::RecordInvalid.new(namespace) + end end end |