lib/rails-settings/settings.rb in rails-settings-cached-0.6.2 vs lib/rails-settings/settings.rb in rails-settings-cached-0.6.3
- old
+ new
@@ -56,10 +56,10 @@
defaults = {}
if Default.enabled?
defaults = starting_with.nil? ? Default.instance : Default.instance.fetch(starting_with, {})
end
- result.merge! defaults
+ result.reverse_merge! defaults
result.with_indifferent_access
end
def where(sql = nil)