mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 17:44:14 -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.
20 lines
605 B
Plaintext
20 lines
605 B
Plaintext
- content_for :page_title do
|
|
= t('admin.disputes.appeals.title')
|
|
|
|
.filters
|
|
.filter-subset
|
|
%strong= t('admin.tags.review')
|
|
%ul
|
|
%li= filter_link_to safe_join([t('admin.accounts.moderation.pending'), "(#{Appeal.pending.count})"], ' '), status: 'pending'
|
|
%li= filter_link_to t('admin.trends.approved'), status: 'approved'
|
|
%li= filter_link_to t('admin.trends.rejected'), status: 'rejected'
|
|
|
|
- if @appeals.empty?
|
|
.muted-hint.center-text
|
|
= t 'admin.disputes.appeals.empty'
|
|
- else
|
|
.announcements-list
|
|
= render partial: 'appeal', collection: @appeals
|
|
|
|
= paginate @appeals
|