Merge 33dbc2e into ac511ba

ledermann · Jul 13, 2016 · 0dcbb9b · 0dcbb9b
2 parents ac511ba + 33dbc2e
commit 0dcbb9b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.rspec b/.rspec
@@ -0,0 +1,4 @@
+--color
+--order random
+--format documentation
+--require spec_helper
diff --git a/lib/rails-settings/base.rb b/lib/rails-settings/base.rb
@@ -22,6 +22,8 @@ def settings(var)
         def settings=(value)
           if value.nil?
             setting_objects.each(&:mark_for_destruction)
+          elsif !self.persisted?
+            return
           else
             raise ArgumentError
           end