From fd22b60b3e8a4ae1dc5bc0807277db2c2fcb252f Mon Sep 17 00:00:00 2001
From: Andrew Kane <andrew@ankane.org>
Date: Fri, 18 Feb 2022 15:24:12 -0800
Subject: [PATCH] Merge settings option last [skip ci]

---
 lib/searchkick/index_options.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/searchkick/index_options.rb b/lib/searchkick/index_options.rb
index 3866853..f949659 100644
--- a/lib/searchkick/index_options.rb
+++ b/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
 
--
libgit2 0.21.0