diff options
| author | Ilya Zhitomirskiy <ilya@laptop.(none)> | 2011-06-10 02:51:59 +0400 |
|---|---|---|
| committer | Ilya Zhitomirskiy <ilya@laptop.(none)> | 2011-06-10 02:51:59 +0400 |
| commit | 71dd8dc7f362b644cbe69dad29292a33707eb436 (patch) | |
| tree | 22d60bced5cd0f3151c70aa1ae14196dd82ae4cc /lib | |
| parent | a03423309dab0676ed6902eadb64d050ffb0c96b (diff) | |
| parent | e1fb5846b6da5642d7dec361a9f31823d9992d98 (diff) | |
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
app/models/app_config.rb
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tasks/db.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake index 94fda525d..68a9439ac 100644 --- a/lib/tasks/db.rake +++ b/lib/tasks/db.rake @@ -4,7 +4,7 @@ namespace :db do desc "rebuild and prepare test db" - task :rebuild => [:drop, :create, 'schema:load', 'db:test:prepare'] + task :rebuild => [:drop, :create, :migrate, 'db:test:prepare'] namespace :integration do # desc 'Check for pending migrations and load the integration schema' |