Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge in sferik/master which had the same fix for static asset loadin…

…g, but didn't check for the files to be present,

which is cool.
  • Loading branch information...
commit dd461108674fd1fb4fdf6b755300b582e8c0f167 2 parents 1cd52f3 + 42bdbb8
@wolframarnold wolframarnold authored
Showing with 1 addition and 5 deletions.
  1. +1 −5 lib/rails_admin/engine.rb
View
6 lib/rails_admin/engine.rb
@@ -4,11 +4,7 @@
module RailsAdmin
class Engine < Rails::Engine
initializer "static assets" do |app|
-
- # If assets were copied for app's public/ folder, e.g. via rake admin:copy_assets, then don't insert the static
- # asset server, as it iterferes with Rails's own asset server.
- if app.config.serve_static_assets &&
- !(%w(stylesheets images javascripts).any?{|cat| File.exists?(File.join(Rails.root,'public',cat,'rails_admin'))})
+ if app.config.serve_static_assets
app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.