From 704b7237e6c4daa3642c01f8803072fdc3a45eaf Mon Sep 17 00:00:00 2001
From: Sytse Sijbrandij <sytses@gmail.com>
Date: Thu, 4 Dec 2014 16:54:08 +0100
Subject: Fix notifications for developers that don't read the documentation.

---
 doc/development/rake_tasks.md | 5 ++++-
 lib/tasks/seed.rake           | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 lib/tasks/seed.rake

diff --git a/doc/development/rake_tasks.md b/doc/development/rake_tasks.md
index 6d9ac161e91..ffa61e66134 100644
--- a/doc/development/rake_tasks.md
+++ b/doc/development/rake_tasks.md
@@ -1,6 +1,6 @@
 # Rake tasks for developers
 
-## Setup db with developer seeds:
+## Setup db with developer seeds
 
 Note that if your db user does not have advanced privileges you must create the db manually before running this command.
 
@@ -8,6 +8,9 @@ Note that if your db user does not have advanced privileges you must create the
 bundle exec rake setup
 ```
 
+The `setup` task is a alias for `gitlab:setup`.
+This tasks calls `db:setup` to create the database, with `add_limits_mysql` it adds limits to the database schema in case of a MySQL database and fianlly it runs `db:seed_fu` to seed the database.
+
 ## Run tests
 
 This runs all test suites present in GitLab.
diff --git a/lib/tasks/seed.rake b/lib/tasks/seed.rake
new file mode 100644
index 00000000000..c54a1e694a5
--- /dev/null
+++ b/lib/tasks/seed.rake
@@ -0,0 +1,8 @@
+namespace :db do
+  namespace :seed  do
+    desc "Seed is replaced with seed_fu"
+    task :dump => :environment do
+      raise "Please run db:seed_fu instead of db:seed."
+    end
+  end
+end
-- 
cgit v1.2.1


From 288df41c0a3b950f3474d9ae00c644d4780de321 Mon Sep 17 00:00:00 2001
From: Sytse Sijbrandij <sytses@gmail.com>
Date: Thu, 4 Dec 2014 18:14:54 +0100
Subject: Seed is not seed dump.

---
 lib/tasks/seed.rake | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/tasks/seed.rake b/lib/tasks/seed.rake
index c54a1e694a5..7c006c16639 100644
--- a/lib/tasks/seed.rake
+++ b/lib/tasks/seed.rake
@@ -1,8 +1,6 @@
 namespace :db do
-  namespace :seed  do
-    desc "Seed is replaced with seed_fu"
-    task :dump => :environment do
-      raise "Please run db:seed_fu instead of db:seed."
-    end
+  desc "Seed is replaced with seed_fu"
+  task :seed => :environment do
+    raise "Please run db:seed_fu instead of db:seed."
   end
 end
-- 
cgit v1.2.1


From 3dc25ba331c4f5c4708b0fcd8478d943d182d760 Mon Sep 17 00:00:00 2001
From: Sytse Sijbrandij <sytses@gmail.com>
Date: Thu, 4 Dec 2014 21:22:21 +0100
Subject: Remove warning from db seed since it is called by db setup.

---
 doc/development/rake_tasks.md | 3 ++-
 lib/tasks/seed.rake           | 6 ------
 2 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100644 lib/tasks/seed.rake

diff --git a/doc/development/rake_tasks.md b/doc/development/rake_tasks.md
index ffa61e66134..53f8095cb13 100644
--- a/doc/development/rake_tasks.md
+++ b/doc/development/rake_tasks.md
@@ -9,7 +9,8 @@ bundle exec rake setup
 ```
 
 The `setup` task is a alias for `gitlab:setup`.
-This tasks calls `db:setup` to create the database, with `add_limits_mysql` it adds limits to the database schema in case of a MySQL database and fianlly it runs `db:seed_fu` to seed the database.
+This tasks calls `db:setup` to create the database, calls `add_limits_mysql` that adds limits to the database schema in case of a MySQL database and fianlly it calls `db:seed_fu` to seed the database.
+Note: `db:setup` calls `db:seed` but this does nothing.
 
 ## Run tests
 
diff --git a/lib/tasks/seed.rake b/lib/tasks/seed.rake
deleted file mode 100644
index 7c006c16639..00000000000
--- a/lib/tasks/seed.rake
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace :db do
-  desc "Seed is replaced with seed_fu"
-  task :seed => :environment do
-    raise "Please run db:seed_fu instead of db:seed."
-  end
-end
-- 
cgit v1.2.1