diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-19 09:46:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-19 09:46:26 +0200 |
| commit | 484b9314e351fcab9e25b04c0024598433d2d688 (patch) | |
| tree | 301ba59a7d214d5cf655263c95d731b9f18b6566 /config | |
| parent | 44e31c3e531e5c206003b7ed83ee1d6fdd3b2b53 (diff) | |
| parent | 88a0395a58739ff0a4bc8ff79bc0b60ac2c0f736 (diff) | |
Merge pull request #652 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 2 | ||||
| -rw-r--r-- | config/routes.rb | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 3028ba5fc..1bffb309b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -6,6 +6,7 @@ en: about_this: About administered_by: 'Administered by:' api: API + apps: Mobile apps closed_registrations: Registrations are currently closed on this instance. However! You can find a different instance to make an account on and get access to the very same network from there. contact: Contact contact_missing: Not set @@ -281,6 +282,7 @@ en: search: Search title: Known instances invites: + deactivate_all: Deactivate all filter: all: All available: Available diff --git a/config/routes.rb b/config/routes.rb index e06b2c1d2..3e0be9380 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -137,7 +137,12 @@ Rails.application.routes.draw do resources :email_domain_blocks, only: [:index, :new, :create, :destroy] resources :action_logs, only: [:index] resource :settings, only: [:edit, :update] - resources :invites, only: [:index, :create, :destroy] + + resources :invites, only: [:index, :create, :destroy] do + collection do + post :deactivate_all + end + end resources :relays, only: [:index, :new, :create, :destroy] do member do |