Commit fd22b60b3e8a4ae1dc5bc0807277db2c2fcb252f
1 parent
27bbe33b
Exists in
master
and in
2 other branches
Merge settings option last [skip ci]
Showing
1 changed file
with
3 additions
and
3 deletions
Show diff stats
lib/searchkick/index_options.rb
@@ -173,9 +173,6 @@ module Searchkick | @@ -173,9 +173,6 @@ module Searchkick | ||
173 | end | 173 | end |
174 | end | 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 | add_synonyms(settings) | 176 | add_synonyms(settings) |
180 | add_search_synonyms(settings) | 177 | add_search_synonyms(settings) |
181 | 178 | ||
@@ -185,6 +182,9 @@ module Searchkick | @@ -185,6 +182,9 @@ module Searchkick | ||
185 | end | 182 | end |
186 | end | 183 | end |
187 | 184 | ||
185 | + # merge settings option last | ||
186 | + settings = settings.symbolize_keys.deep_merge((options[:settings] || {}).symbolize_keys) | ||
187 | + | ||
188 | settings | 188 | settings |
189 | end | 189 | end |
190 | 190 |