summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytses@gmail.com>2014-12-04 21:22:21 +0100
committerSytse Sijbrandij <sytses@gmail.com>2014-12-04 21:22:21 +0100
commit3dc25ba331c4f5c4708b0fcd8478d943d182d760 (patch)
tree37ab858dae58f4083083e55be1b15aa15c7f2c3b
parent288df41c0a3b950f3474d9ae00c644d4780de321 (diff)
downloadgitlab-ce-3dc25ba331c4f5c4708b0fcd8478d943d182d760.tar.gz
Remove warning from db seed since it is called by db setup.
-rw-r--r--doc/development/rake_tasks.md3
-rw-r--r--lib/tasks/seed.rake6
2 files changed, 2 insertions, 7 deletions
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