diff options
| author | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-03-07 14:51:56 +0100 |
|---|---|---|
| committer | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-03-07 14:51:56 +0100 |
| commit | 3374027e3a4e4eb040e59294a9ced9d7886a71e2 (patch) | |
| tree | 4587984396a32047a6337e7810a39633ba683545 /lib/tasks | |
| parent | 39114d259c6e4bd5bb60b18f561d06cc24e8c852 (diff) | |
| parent | 9c2a6e201388e7e30987a8679ddfa65b9422a38c (diff) | |
| download | gitlab-ce-3374027e3a4e4eb040e59294a9ced9d7886a71e2.tar.gz | |
Merge branch 'master' into fixes/api, code clean up and tests fixed
Conflicts:
doc/api/projects.md
spec/requests/api/projects_spec.rb
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/gitlab/setup.rake | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/tasks/gitlab/setup.rake b/lib/tasks/gitlab/setup.rake index 8d4950cf396..5b74daf956e 100644 --- a/lib/tasks/gitlab/setup.rake +++ b/lib/tasks/gitlab/setup.rake @@ -7,10 +7,12 @@ namespace :gitlab do def setup_db warn_user_is_not_gitlab - puts "This will create the necessary database tables and seed the database." - puts "You will lose any previous data stored in the database." - ask_to_continue - puts "" + unless ENV['force'] == 'yes' + puts "This will create the necessary database tables and seed the database." + puts "You will lose any previous data stored in the database." + ask_to_continue + puts "" + end Rake::Task["db:setup"].invoke Rake::Task["db:seed_fu"].invoke |