mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 12:52:52 +00: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.
53 lines
2.1 KiB
Plaintext
53 lines
2.1 KiB
Plaintext
- content_for :page_title do
|
|
= t('admin.instances.title')
|
|
|
|
- content_for :heading_actions do
|
|
- if whitelist_mode?
|
|
= link_to t('admin.domain_allows.add_new'), new_admin_domain_allow_path, class: 'button', id: 'add-instance-button'
|
|
= link_to t('admin.domain_allows.export'), export_admin_export_domain_allows_path(format: :csv), class: 'button'
|
|
= link_to t('admin.domain_allows.import'), new_admin_export_domain_allow_path, class: 'button'
|
|
- else
|
|
= link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path, class: 'button', id: 'add-instance-button'
|
|
= link_to t('admin.domain_blocks.export'), export_admin_export_domain_blocks_path(format: :csv), class: 'button'
|
|
= link_to t('admin.domain_blocks.import'), new_admin_export_domain_block_path, class: 'button'
|
|
|
|
.filters
|
|
.filter-subset
|
|
%strong= t('admin.instances.moderation.title')
|
|
%ul
|
|
%li= filter_link_to t('admin.instances.moderation.all'), limited: nil
|
|
|
|
- unless whitelist_mode?
|
|
%li= filter_link_to t('admin.instances.moderation.limited'), limited: '1'
|
|
|
|
.filter-subset
|
|
%strong= t('admin.instances.availability.title')
|
|
%ul
|
|
%li= filter_link_to t('admin.instances.delivery.all'), availability: nil
|
|
%li= filter_link_to t('admin.instances.delivery.failing'), availability: 'failing'
|
|
%li= filter_link_to t('admin.instances.delivery.unavailable'), availability: 'unavailable'
|
|
|
|
- unless whitelist_mode?
|
|
= form_tag admin_instances_url, method: 'GET', class: 'simple_form' do
|
|
.fields-group
|
|
- InstanceFilter::KEYS.each do |key|
|
|
= hidden_field_tag key, params[key] if params[key].present?
|
|
|
|
- %i(by_domain).each do |key|
|
|
.input.string.optional
|
|
= text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.instances.#{key}")
|
|
|
|
.actions
|
|
%button.button= t('admin.accounts.search')
|
|
= link_to t('admin.accounts.reset'), admin_instances_path, class: 'button negative'
|
|
|
|
%hr.spacer/
|
|
|
|
- if @instances.empty?
|
|
.muted-hint.center-text
|
|
= t 'admin.instances.empty'
|
|
- else
|
|
= render partial: 'instance', collection: @instances
|
|
|
|
= paginate @instances
|