summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-05-11 14:11:04 +0200
committerYorick Peterse <yorickpeterse@gmail.com>2016-05-12 13:03:55 +0200
commit36083b4d0ee6787da6be13b45cc7144de704c308 (patch)
tree09435256de20597c7860a347d2f0a4ed1b8da8ec /lib
parent443c3aa5972fda2f9899fe3618ebfb9a31f59e1f (diff)
downloadgitlab-ce-36083b4d0ee6787da6be13b45cc7144de704c308.tar.gz
Fixed styling per Rubocop pedantics
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/database/migration_helpers.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
index 7aa8c90e6d1..4773a88d0c1 100644
--- a/lib/gitlab/database/migration_helpers.rb
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -119,7 +119,9 @@ module Gitlab
transaction do
update_column_in_batches(table, column, default)
end
- rescue Exception => error
+ # We want to rescue _all_ exceptions here, even those that don't inherit
+ # from StandardError.
+ rescue Exception => error # rubocop: disable all
remove_column(table, column)
raise error