diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-02-14 12:48:50 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-02-14 12:48:50 +0000 |
| commit | 48c505ebba37f5b673215160040ac66770ce037e (patch) | |
| tree | 8ff15a2b4f62b1905fcd7dbe417da7beb8a11c54 | |
| parent | 215dff761e75c2b59c2a57c8bbe6deac77a8a766 (diff) | |
| parent | a4a7d2acee32d74fcf9177024f9da63d2e6ebfa1 (diff) | |
| download | gitlab-ce-48c505ebba37f5b673215160040ac66770ce037e.tar.gz | |
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
| -rw-r--r-- | app/models/event.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/models/event.rb b/app/models/event.rb index 8a79100de5a..75538ba196c 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -96,10 +96,6 @@ class Event < ActiveRecord::Base 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 def model_name ActiveModel::Name.new(self, nil, 'event') |