about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--.env.vagrant3
-rw-r--r--config/routes.rb2
2 files changed, 4 insertions, 1 deletions
diff --git a/.env.vagrant b/.env.vagrant
index 0ab0552c9..04b889d00 100644
--- a/.env.vagrant
+++ b/.env.vagrant
@@ -1 +1,2 @@
-VAGRANT=true
\ No newline at end of file
+VAGRANT=true
+LOCAL_DOMAIN=mastodon.dev
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 15fb924f1..9423a0ae2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -68,6 +68,8 @@ Rails.application.routes.draw do
     end
   end
 
+  get '/admin', to: redirect('/admin/settings', status: 302)
+
   namespace :api do
     # PubSubHubbub outgoing subscriptions
     resources :subscriptions, only: [:show]