gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Add (back) option to set redirect notice on account without moving followers (#11994)

Browse source 
Fix #11913
This commit is contained in:
Eugen Rochko 2019-09-29 05:03:19 +02:00 • committed by GitHub
parent b0cda7a504
commit 163ed91af3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 144 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/locales/en.yml
View file

@ -831,13 +831,16 @@ en:
past_migrations: Past migrations
proceed_with_move: Move followers
redirecting_to: Your account is redirecting to %{acct}.
set_redirect: Set redirect
warning:
backreference_required: The new account must first be configured to back-reference this one
before: 'Before proceeding, please read these notes carefully:'
cooldown: After moving there is a cooldown period during which you will not be able to move again
disabled_account: Your current account will not be fully usable afterwards. However, you will have access to data export as well as re-activation.
followers: This action will move all followers from the current account to the new account
only_redirect_html: Alternatively, you can <a href="%{path}">only put up a redirect on your profile</a>.
other_data: No other data will be moved automatically
redirect: Your current account's profile will be updated with a redirect notice and be excluded from searches
moderation:
title: Moderation
notification_mailer:

7
config/routes.rb
View file

@ -134,11 +134,10 @@ Rails.application.routes.draw do
end
resource :delete, only: [:show, :destroy]
resource :migration, only: [:show, :create]
resource :migration, only: [:show, :create] do
collection do
post :cancel
end
namespace :migration do
resource :redirect, only: [:new, :create, :destroy]
end
resources :aliases, only: [:index, :create, :destroy]