diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-04-03 17:21:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-03 17:21:33 +0200 |
commit | 8192b0da7cd1fac38a68eab6746fc7ec74328a77 (patch) | |
tree | 686c30ed5f6c4cfe5f6b4d84e46ff19f7baa6949 /app/models/report.rb | |
parent | cbdb25ab0343603165fc89fd28b07c9ca0f2ae6d (diff) | |
parent | 7b15f4006adb5f8f04d83174532c30eeb78757b0 (diff) |
Merge pull request #2155 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/report.rb')
-rw-r--r-- | app/models/report.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/report.rb b/app/models/report.rb index a9940459d..c3a0c4c8b 100644 --- a/app/models/report.rb +++ b/app/models/report.rb @@ -21,7 +21,7 @@ # class Report < ApplicationRecord - self.ignored_columns = %w(action_taken) + self.ignored_columns += %w(action_taken) include Paginable include RateLimitable |