Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 5 deletions

diff --git a/rubocop/migration_helpers.rb b/rubocop/migration_helpers.rb
index c066d424437..577f768da67 100644
--- a/rubocop/migration_helpers.rb
+++ b/rubocop/migration_helpers.rb
@@ -3,15 +3,17 @@ module RuboCop
   module MigrationHelpers
     # Returns true if the given node originated from the db/migrate directory.
     def in_migration?(node)
-      dirname = File.dirname(node.location.expression.source_buffer.name)
-
-      dirname.end_with?('db/migrate', 'db/post_migrate')
+      dirname(node).end_with?('db/migrate', 'db/geo/migrate') || in_post_deployment_migration?(node)
     end
 
     def in_post_deployment_migration?(node)
-      dirname = File.dirname(node.location.expression.source_buffer.name)
+      dirname(node).end_with?('db/post_migrate', 'db/geo/post_migrate')
+    end
+
+    private
 
-      dirname.end_with?('db/post_migrate')
+    def dirname(node)
+      File.dirname(node.location.expression.source_buffer.name)
     end
   end
 end