Merge settings option last [skip ci]

Andrew Kane
1 parent 27bbe33b
Showing 1 changed file with 3 additions and 3 deletions Show diff stats
lib/searchkick/index_options.rb
@@ -173,9 +173,6 @@ module Searchkick
         end
       end
  
-      # TODO do this last in Searchkick 5
-      settings = settings.symbolize_keys.deep_merge((options[:settings] || {}).symbolize_keys)
-
       add_synonyms(settings)
       add_search_synonyms(settings)
  
@@ -185,6 +182,9 @@ module Searchkick
         end
       end
  
+      # merge settings option last
+      settings = settings.symbolize_keys.deep_merge((options[:settings] || {}).symbolize_keys)
+
       settings
     end
...	...	@@ -173,9 +173,6 @@ module Searchkick
173	173	end
174	174	end
175	175
176		- # TODO do this last in Searchkick 5
177		- settings = settings.symbolize_keys.deep_merge((options[:settings] \|\| {}).symbolize_keys)
178		-
179	176	add_synonyms(settings)
180	177	add_search_synonyms(settings)
181	178
...	...	@@ -185,6 +182,9 @@ module Searchkick
185	182	end
186	183	end
187	184
	185	+ # merge settings option last
	186	+ settings = settings.symbolize_keys.deep_merge((options[:settings] \|\| {}).symbolize_keys)
	187	+
188	188	settings
189	189	end
190	190
...	...