diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-01-02 13:45:18 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-02 15:36:53 +0100 |
| commit | 571d219bb917cefcca7419a0ad4e3889689d5f6a (patch) | |
| tree | 6ab91adcb2c164fd027708e58f5fb96c52474007 /app/models/form | |
| parent | b300948526d967aaf5608c93546ee0d54940c0ef (diff) | |
| parent | 66436d08959998be20c6c6bf631177d8c1f3e0d1 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock
Diffstat (limited to 'app/models/form')
| -rw-r--r-- | app/models/form/status_batch.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/models/form/status_batch.rb b/app/models/form/status_batch.rb index 8f5fd1fa2..898728067 100644 --- a/app/models/form/status_batch.rb +++ b/app/models/form/status_batch.rb @@ -6,8 +6,6 @@ class Form::StatusBatch attr_accessor :status_ids, :action, :current_account - ACTION_TYPE = %w(nsfw_on nsfw_off delete).freeze - def save case action when 'nsfw_on', 'nsfw_off' |