From 441cac758f759ba16744f80e1d981e84f415bd29 Mon Sep 17 00:00:00 2001
From: Effy Elden <effy@effy.space>
Date: Fri, 16 Dec 2022 01:56:05 +1100
Subject: [PATCH] Allow adding relays while secure mode & limited federation
mode are enabled (#22324)
---
app/controllers/admin/relays_controller.rb | 6 +++---
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 6fbb6e0630..c1297c8b99 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 0a0effbc1d..2fcfd4ee16 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: