Commit 48c505eb authored by Yorick Peterse's avatar Yorick Peterse

Merge branch '38135-remove-ignore-column-from-events' into 'master'

Remove ignore_column :data from Event

Closes #38135

See merge request gitlab-org/gitlab-ce!17094
parents 215dff76 a4a7d2ac
...@@ -96,10 +96,6 @@ class Event < ActiveRecord::Base ...@@ -96,10 +96,6 @@ class Event < ActiveRecord::Base
self.inheritance_column = 'action' self.inheritance_column = 'action'
# "data" will be removed in 10.0 but it may be possible that JOINs happen that
# include this column, hence we're ignoring it as well.
ignore_column :data
class << self class << self
def model_name def model_name
ActiveModel::Name.new(self, nil, 'event') ActiveModel::Name.new(self, nil, 'event')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment