Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb
index 2456a5dd68e..04cf056199c 100644
--- a/lib/gitlab/database.rb
+++ b/lib/gitlab/database.rb
@@ -217,13 +217,13 @@ module Gitlab
       Rails.application.config.paths['db'].each do |db_path|
         path = Rails.root.join(db_path, 'post_migrate').to_s
 
-        unless Rails.application.config.paths['db/migrate'].include? path
-          Rails.application.config.paths['db/migrate'] << path
+        next if Rails.application.config.paths['db/migrate'].include? path
 
-          # Rails memoizes migrations at certain points where it won't read the above
-          # path just yet. As such we must also update the following list of paths.
-          ActiveRecord::Migrator.migrations_paths << path
-        end
+        Rails.application.config.paths['db/migrate'] << path
+
+        # Rails memoizes migrations at certain points where it won't read the above
+        # path just yet. As such we must also update the following list of paths.
+        ActiveRecord::Migrator.migrations_paths << path
       end
     end