Merge branch 'dev-seeds' into 'master'

Improve developer seeds

2 files changed, 22 insertions, 3 deletions

diff --git a/lib/gitlab/seeder.rb b/lib/gitlab/seeder.rb
index 3aa3b2ba1e9..39de1223b18 100644
--- a/lib/gitlab/seeder.rb
+++ b/lib/gitlab/seeder.rb
@@ -1,10 +1,29 @@
 module Gitlab
   class Seeder
     def self.quiet
+      mute_mailer
       SeedFu.quiet = true
       yield
       SeedFu.quiet = false
       puts "\nOK".green
     end
+
+    def self.by_user(user)
+      begin
+        Thread.current[:current_user] = user
+        yield
+      ensure
+        Thread.current[:current_user] = nil
+      end
+    end
+
+    def self.mute_mailer
+      code = <<-eos
+def Notify.delay
+  self
+end
+      eos
+      eval(code)
+    end
   end
 end
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index 7d3602211c1..058c7417040 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -1,10 +1,10 @@
+task dev: ["dev:setup"]
+
 namespace :dev do
   desc "GITLAB | Setup developer environment (db, fixtures)"
   task :setup => :environment do
     ENV['force'] = 'yes'
-    Rake::Task["db:setup"].invoke
-    Rake::Task["db:seed_fu"].invoke
+    Rake::Task["gitlab:setup"].invoke
     Rake::Task["gitlab:shell:setup"].invoke
   end
 end
-