diff options
| author | DJ Mountney <david@twkie.net> | 2016-05-06 10:08:05 -0700 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2016-05-25 10:44:22 -0700 |
| commit | 24632d215029f8a03cf6742363d42dbf63fa92f2 (patch) | |
| tree | 3807e1e82a23959713190fe5b42e2a282acaa544 | |
| parent | c6e7d826b271a0fc51ed7eb7772c1820c720f1ff (diff) | |
| download | gitlab-ce-24632d215029f8a03cf6742363d42dbf63fa92f2.tar.gz | |
Update hash syntax and add changelog for the gitlab:db:configure rake task
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/tasks/gitlab/db.rake | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index c59a66874c3..56e6ea1686c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -46,6 +46,7 @@ v 8.8.0 - Sanitize repo paths in new project error message - Bump mail_room to 0.7.0 to fix stuck IDLE connections - Remove future dates from contribution calendar graph. + - Add rake task 'gitlab:db:configure' for conditionally seeding or migrating the database - Support e-mail notifications for comments on project snippets - Fix API leak of notes of unauthorized issues, snippets and merge requests - Use ActionDispatch Remote IP for Akismet checking diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake index a414e480575..5ae47c15d7d 100644 --- a/lib/tasks/gitlab/db.rake +++ b/lib/tasks/gitlab/db.rake @@ -38,8 +38,7 @@ namespace :gitlab do end desc 'Configures the database by running migrate, or by loading the schema and seeding if needed' - task :configure => :environment do - # Runs migrate if the schema has already been loaded, otherwise loads the schema and seeds + task configure: :environment do if ActiveRecord::Base.connection.table_exists? 'schema_migrations' Rake::Task['db:migrate'].invoke else |