Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
162 changes: 0 additions & 162 deletions app/controllers/admin/account_merger_controller.rb

This file was deleted.

2 changes: 1 addition & 1 deletion app/controllers/concerns/auth_helpers.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

# Shared signin/admin authorization helpers used by HTML controllers
# (sessions, account_merger, settings/*, admin/*, my/*).
# (sessions, settings/*, admin/*, my/*).
#
# These helpers redirect on failure and return falsy so callers can do
# `return unless require_signed_in!(...)` or chain off of them.
Expand Down
3 changes: 1 addition & 2 deletions app/controllers/inertia_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,7 @@ def inertia_ultraadmin_links
return [] unless current_user&.admin_level == "ultraadmin"
[
inertia_link("GoodBoy", good_job_path, active: helpers.current_page?(good_job_path), inertia: false),
inertia_link("Feature Flags", flipper_path, active: helpers.current_page?(flipper_path), inertia: false),
inertia_link("Account Merger", admin_account_merger_path, active: helpers.current_page?(admin_account_merger_path) || request.path.start_with?("/admin/account_merger"))
inertia_link("Feature Flags", flipper_path, active: helpers.current_page?(flipper_path), inertia: false)
]
end

Expand Down
192 changes: 0 additions & 192 deletions app/javascript/pages/Admin/AccountMerger.svelte

This file was deleted.

9 changes: 0 additions & 9 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,6 @@ def matches?(request)
end
end

constraints AdminLevelConstraint.new(:ultraadmin) do
namespace :admin, defaults: { export: true } do
resource :account_merger, only: [ :show ], controller: "account_merger" do
get :search_users
post :merge
end
end
end

# Read-only admin surfaces — viewers are allowed.
constraints AdminLevelConstraint.new(:superadmin, :admin, :viewer, :ultraadmin) do
namespace :admin, defaults: { export: true } do
Expand Down
Loading
Loading