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