diff options
| author | Effy Elden <effy@effy.space> | 2022-12-16 01:56:05 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-15 15:56:05 +0100 |
| commit | 441cac758f759ba16744f80e1d981e84f415bd29 (patch) | |
| tree | 9e3f78b816f90384bd8a587df795c70bd6008c29 | |
| parent | 7b68e6409bff40e60dd5c04c4e562177c2b14bc5 (diff) | |
Allow adding relays while secure mode & limited federation mode are enabled (#22324)
| -rw-r--r-- | app/controllers/admin/relays_controller.rb | 6 | ||||
| -rw-r--r-- | config/locales/en.yml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/admin/relays_controller.rb b/app/controllers/admin/relays_controller.rb index 6fbb6e063..c1297c8b9 100644 --- a/app/controllers/admin/relays_controller.rb +++ b/app/controllers/admin/relays_controller.rb @@ -3,7 +3,7 @@ module Admin class RelaysController < BaseController before_action :set_relay, except: [:index, :new, :create] - before_action :require_signatures_enabled!, only: [:new, :create, :enable] + before_action :warn_signatures_not_enabled!, only: [:new, :create, :enable] def index authorize :relay, :update? @@ -56,8 +56,8 @@ module Admin params.require(:relay).permit(:inbox_url) end - def require_signatures_enabled! - redirect_to admin_relays_path, alert: I18n.t('admin.relays.signatures_not_enabled') if authorized_fetch_mode? + def warn_signatures_not_enabled! + flash.now[:error] = I18n.t('admin.relays.signatures_not_enabled') if authorized_fetch_mode? end end end diff --git a/config/locales/en.yml b/config/locales/en.yml index 0a0effbc1..2fcfd4ee1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -557,7 +557,7 @@ en: pending: Waiting for relay's approval save_and_enable: Save and enable setup: Setup a relay connection - signatures_not_enabled: Relays will not work correctly while secure mode or limited federation mode is enabled + signatures_not_enabled: Relays may not work correctly while secure mode or limited federation mode is enabled status: Status title: Relays report_notes: |