Merge branch 'master' into comment-updated-bycomment-updated-by

2 files changed, 12 insertions, 0 deletions

diff --git a/app/models/abuse_report.rb b/app/models/abuse_report.rb
new file mode 100644
index 00000000000..c8c39db11bc
--- /dev/null
+++ b/app/models/abuse_report.rb
@@ -0,0 +1,9 @@
+class AbuseReport < ActiveRecord::Base
+  belongs_to :reporter, class_name: "User"
+  belongs_to :user
+
+  validates :reporter, presence: true
+  validates :user, presence: true
+  validates :message, presence: true
+  validates :user_id, uniqueness: { scope: :reporter_id }
+end
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 815672a1bf7..161a16ca61c 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -114,6 +114,9 @@ class Namespace < ActiveRecord::Base
   end
 
   def move_dir
+    # Ensure old directory exists before moving it
+    gitlab_shell.add_namespace(path_was)
+
     if gitlab_shell.mv_namespace(path_was, path)
       # If repositories moved successfully we need to
       # send update instructions to users.