summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorBrett Walker <bwalker@gitlab.com>2018-05-10 10:00:32 -0500
committerBrett Walker <bwalker@gitlab.com>2018-05-10 10:00:32 -0500
commit42d27f0b43df544bab2ad5bc4e082728d86c7388 (patch)
tree213e6f0c028d8f60fb4f68c22b710ac4102fbb7d /app/models
parent8279df2c055abecfd51ef79b87fbcef5da37c618 (diff)
downloadgitlab-ce-42d27f0b43df544bab2ad5bc4e082728d86c7388.tar.gz
only issue a warning if column doesn't exist
Diffstat (limited to 'app/models')
-rw-r--r--app/models/concerns/sha_attribute.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/concerns/sha_attribute.rb b/app/models/concerns/sha_attribute.rb
index 3340dc96e9f..3796737427a 100644
--- a/app/models/concerns/sha_attribute.rb
+++ b/app/models/concerns/sha_attribute.rb
@@ -22,7 +22,8 @@ module ShaAttribute
column = columns.find { |c| c.name == name.to_s }
unless column
- raise ArgumentError.new("sha_attribute #{name.inspect} is invalid since the column doesn't exist")
+ warn "WARNING: sha_attribute #{name.inspect} is invalid since the column doesn't exist - you may need to run database migrations"
+ return
end
unless column.type == :binary