mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-12-01 20:40:31 -05:00
3ef5f62abf
Conflicts: - `.github/workflows/build-image.yml`: Upstream switched to pushing to both DockerHub and GitHub Container Repository, while glitch-soc was already pushing to the latter only. Updated our configuration to be slightly more consistent with upstream's naming and styling, but kept our behavior. - `Gemfile.lock`: Updated dependencies textually too close to glitch-soc only hcaptcha dependency. Updated dependencies as upstream did. - `README.md`: Upstream updated its README, but we have a completely different one. Kept our README, though it probably should be reworked at some point. - `app/views/auth/sessions/two_factor.html.haml`: Minor style fix upstream that's on a line glitch-soc removed because of its different theming system. Kept our file as is. - `spec/controllers/health_controller_spec.rb`: This file apparently did not exist upstream, upstream created it with different contents but it is functionally the same. Switched to upstream's version of the file. - `spec/presenters/instance_presenter_spec.rb`: Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc had its own code because it's a fork and does not have the same default source URL. Took upstream's change, but with glitch-soc's repo as the default case. - `yarn.lock`: Upstream dependencies textually too close to a glitch-soc only one. Updated dependencies as upstream did.
26 lines
1.1 KiB
Plaintext
26 lines
1.1 KiB
Plaintext
- content_for :page_title do
|
|
= t('admin.action_logs.title')
|
|
|
|
= form_tag admin_action_logs_url, method: 'GET', class: 'simple_form' do
|
|
= hidden_field_tag :target_account_id, params[:target_account_id] if params[:target_account_id].present?
|
|
|
|
.filters
|
|
.filter-subset.filter-subset--with-select
|
|
%strong= t('admin.action_logs.filter_by_user')
|
|
.input.select.optional
|
|
= select_tag :account_id, options_from_collection_for_select(@auditable_accounts, :id, :username, params[:account_id]), prompt: I18n.t('admin.accounts.moderation.all')
|
|
|
|
.filter-subset.filter-subset--with-select
|
|
%strong= t('admin.action_logs.filter_by_action')
|
|
.input.select.optional
|
|
= select_tag :action_type, options_for_select(Admin::ActionLogFilter::ACTION_TYPE_MAP.keys.map { |key| [I18n.t("admin.action_logs.action_types.#{key}"), key]}, params[:action_type]), prompt: I18n.t('admin.accounts.moderation.all')
|
|
|
|
- if @action_logs.empty?
|
|
.muted-hint.center-text
|
|
= t 'admin.action_logs.empty'
|
|
- else
|
|
.report-notes
|
|
= render partial: 'action_log', collection: @action_logs
|
|
|
|
= paginate @action_logs
|