nrd.li/mastodon
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into skylight

Browse source
This commit is contained in:
Eugen Rochko 2017-04-13 22:22:26 +02:00
parent 17c2ba7366 c5afe573da
commit 791c0edfe8
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/components/features/ui/index.jsx
View file

@ -47,7 +47,7 @@ const UI = React.createClass({
this.dragTargets.push(e.target); this.dragTargets.push(e.target);
} }
if (e.dataTransfer && e.dataTransfer.files.length > 0) { if (e.dataTransfer && e.dataTransfer.items.length > 0) {
this.setState({ draggingOver: true }); this.setState({ draggingOver: true });
} }
}, },

2
config/application.rb
View file

@ -62,7 +62,9 @@ module Mastodon
config.middleware.use Rack::Attack config.middleware.use Rack::Attack
config.middleware.use Rack::Deflater config.middleware.use Rack::Deflater
config.browserify_rails.source_map_environments << 'development'
config.browserify_rails.commandline_options = '--transform [ babelify --presets [ es2015 react ] ] --extension=".jsx"' config.browserify_rails.commandline_options = '--transform [ babelify --presets [ es2015 react ] ] --extension=".jsx"'
config.browserify_rails.evaluate_node_modules = true
config.to_prepare do config.to_prepare do
Doorkeeper::AuthorizationsController.layout 'public' Doorkeeper::AuthorizationsController.layout 'public'