summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2017-09-07 18:50:03 -0700
committerMichael Kozono <mkozono@gmail.com>2017-09-14 14:17:23 -0700
commitf1e963bd89e737868a3a49358d714a288738c2e8 (patch)
treef6dabb0d992f24eef6ce23f40781a797e8f0bc5b /lib
parentbedcb7f43ddb8d6e2cce9424e3d988fe1d5a7cc8 (diff)
downloadgitlab-ce-f1e963bd89e737868a3a49358d714a288738c2e8.tar.gz
Add specs for deleting conflicting redirects
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/background_migration/delete_conflicting_redirect_routes_range.rb (renamed from lib/gitlab/background_migration/delete_conflicting_redirect_routes.rb)4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/background_migration/delete_conflicting_redirect_routes.rb b/lib/gitlab/background_migration/delete_conflicting_redirect_routes_range.rb
index c33b6d513da..a45fb6b6d0c 100644
--- a/lib/gitlab/background_migration/delete_conflicting_redirect_routes.rb
+++ b/lib/gitlab/background_migration/delete_conflicting_redirect_routes_range.rb
@@ -1,6 +1,6 @@
module Gitlab
module BackgroundMigration
- class DeleteConflictingRedirectRoutes
+ class DeleteConflictingRedirectRoutesRange
class Route < ActiveRecord::Base
self.table_name = 'routes'
end
@@ -17,7 +17,7 @@ module Gitlab
conflicts = RedirectRoute.where(routes_match_redirects_clause(start_id, end_id))
num_rows = conflicts.delete_all
- Rails.logger.info("Gitlab::BackgroundMigration::DeleteConflictingRedirectRoutes [#{start_id}, #{end_id}] - Deleted #{num_rows} redirect routes that were conflicting with routes.")
+ Rails.logger.info("Gitlab::BackgroundMigration::DeleteConflictingRedirectRoutesRange [#{start_id}, #{end_id}] - Deleted #{num_rows} redirect routes that were conflicting with routes.")
end
def migrate?