Merge branch 'master' of git://github.com/stefanoverna/activeadmin-globalize3

Author: marcusg

lib/active_admin/globalize3/active_record_extension.rb

@@ -16,15 +16,17 @@ def active_admin_translates(*args, &block)
       if block
         translation_class.instance_eval &block
       end
-      translation_class.attr_accessible :locale
-      translation_class.attr_accessible *args
 
-      attr_accessible :translations_attributes
+      unless translation_class.ancestors.include? ::ActiveModel::ForbiddenAttributesProtection
+        translation_class.attr_accessible :locale
+        translation_class.attr_accessible *args
+      end
+
+      attr_accessible :translations_attributes unless ancestors.include? ::ActiveModel::ForbiddenAttributesProtection
       accepts_nested_attributes_for :translations, allow_destroy: true
 
       include Methods
     end
 
   end
 end
-