Fixes #1845 - Default assets registered twice by ActiveAdmin.setup

activeadmin · Mar 7, 2013 · d32f841 · d32f841
1 parent 3c906d1
commit d32f841
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/active_admin/asset_registration.rb b/lib/active_admin/asset_registration.rb
@@ -4,7 +4,8 @@ module AssetRegistration
     # Stylesheets
 
     def register_stylesheet(*args)
-      stylesheets << ActiveAdmin::Stylesheet.new(*args)
+      tmp = ActiveAdmin::Stylesheet.new(*args)
+      stylesheets << tmp unless stylesheets.include? tmp
     end
 
     def stylesheets
@@ -19,7 +20,7 @@ def clear_stylesheets!
     # Javascripts
 
     def register_javascript(name)
-      javascripts << name
+      javascripts << name unless javascripts.include? name
     end
 
     def javascripts