about summary refs log tree commit diff
path: root/config/application.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-08-24 17:56:44 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-08-24 17:56:44 +0200
commit49520d6e627e49a1f9f1b8cfa9b323450307fcc6 (patch)
tree49b3f093b1791bfa9434a4507d45944342d2dc43 /config/application.rb
parent68c93f8b859617fb6bb2dc5cf6c5f9a6362bf6a8 (diff)
Adding React.js, Redux, revamping dashboard
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb
index c3ea5851a..81205de32 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -28,12 +28,14 @@ module Mastodon
     config.active_job.queue_adapter = :sidekiq
 
     config.to_prepare do
-      Doorkeeper::ApplicationsController.layout           'dashboard'
-      Doorkeeper::AuthorizedApplicationsController.layout 'dashboard'
+      # Doorkeeper::ApplicationsController.layout           'dashboard'
+      # Doorkeeper::AuthorizedApplicationsController.layout 'dashboard'
       Doorkeeper::AuthorizationsController.layout         'auth'
     end
 
     config.middleware.use Rack::Attack
     config.middleware.use Rack::Deflater
+
+    config.browserify_rails.commandline_options = "--transform [ babelify --presets [ es2015 react ] ] --extension=\".jsx\""
   end
 end