diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-15 12:20:56 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-15 12:20:56 -0600 |
| commit | 82b2e224a26765caf743b24844912faa2de9873a (patch) | |
| tree | 1ee49dd3dbcef7867ad93f875262951612815851 /app/helpers | |
| parent | 6abb0950c6f694607cdc6a0c564751400d52ad5a (diff) | |
| parent | e0a573a2cef924fdfec2cd7ec96a712fe2de1511 (diff) | |
Merge branch 'gs-master' into prevent-local-only-federation
Conflicts: db/schema.rb
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/admin/filter_helper.rb | 9 | ||||
| -rw-r--r-- | app/helpers/settings_helper.rb | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/app/helpers/admin/filter_helper.rb b/app/helpers/admin/filter_helper.rb index 9443934b3..359c43d0e 100644 --- a/app/helpers/admin/filter_helper.rb +++ b/app/helpers/admin/filter_helper.rb @@ -1,11 +1,12 @@ # frozen_string_literal: true module Admin::FilterHelper - ACCOUNT_FILTERS = %i(local remote by_domain silenced suspended recent username display_name email ip).freeze - REPORT_FILTERS = %i(resolved account_id target_account_id).freeze - INVITE_FILTER = %i(available expired).freeze + ACCOUNT_FILTERS = %i(local remote by_domain silenced suspended recent username display_name email ip staff).freeze + REPORT_FILTERS = %i(resolved account_id target_account_id).freeze + INVITE_FILTER = %i(available expired).freeze + CUSTOM_EMOJI_FILTERS = %i(local remote by_domain shortcode).freeze - FILTERS = ACCOUNT_FILTERS + REPORT_FILTERS + INVITE_FILTER + FILTERS = ACCOUNT_FILTERS + REPORT_FILTERS + INVITE_FILTER + CUSTOM_EMOJI_FILTERS def filter_link_to(text, link_to_params, link_class_params = link_to_params) new_url = filtered_url_for(link_to_params) diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index abce85812..1d4cb8a57 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -10,6 +10,7 @@ module SettingsHelper eo: 'Esperanto', es: 'Español', fa: 'فارسی', + gl: 'Galego', fi: 'Suomi', fr: 'Français', he: 'עברית', |