Update namespace if user changed username. Dont move project if new record

2 files changed, 7 insertions, 1 deletions

diff --git a/app/observers/project_observer.rb b/app/observers/project_observer.rb
index ed503f3d116..16457e0ca05 100644
--- a/app/observers/project_observer.rb
+++ b/app/observers/project_observer.rb
@@ -1,7 +1,7 @@
 class ProjectObserver < ActiveRecord::Observer
   def before_save(project)
     # Move repository if namespace changed
-    if project.namespace_id_changed?
+    if project.namespace_id_changed? and not project.new_record?
       move_project(project)
     end
   end
diff --git a/app/observers/user_observer.rb b/app/observers/user_observer.rb
index 654621f7e1c..3834123871c 100644
--- a/app/observers/user_observer.rb
+++ b/app/observers/user_observer.rb
@@ -9,6 +9,12 @@ class UserObserver < ActiveRecord::Observer
     log_info("User \"#{user.name}\" (#{user.email})  was removed")
   end
 
+  def after_save user
+    if user.username_changed?
+      user.namespace.update_attributes(code: user.username)
+    end
+  end
+
   protected
 
   def log_info message