Merge branch 'main' into glitch-soc/merge-upstream

2021-06-23 10:46:24 +02:00
parent a434f370f3 63b807cffc
commit 37fd9670a5
25 changed files with 762 additions and 677 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -166,6 +166,7 @@ Rails.application.routes.draw do
    resources :aliases, only: [:index, :create, :destroy]
    resources :sessions, only: [:destroy]
    resources :featured_tags, only: [:index, :create, :destroy]
+    resources :login_activities, only: [:index]
  end

  resources :media, only: [:show] do
@ -224,7 +225,7 @@ Rails.application.routes.draw do
        post :stop_delivery
      end
    end
-  
+
    resources :rules

    resources :reports, only: [:index, :show] do