Merge branch 'v1'

Conflicts: HISTORY
alexchee · Jan 4, 2012 · 53fbf07 · 53fbf07
2 parents 591385f + 67ff4b0
commit 53fbf07
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/HISTORY b/HISTORY
@@ -1,3 +1,6 @@
+Edge:
+* Allow for rank_expr option being passed through to Riddle.
+
 2.0.11 - January 2nd 2011
 * Call #all on search results to force population of results, matching ActiveRecord::Relation#all in essence. (Adrian Macneil).
 * 1.4.11 changes.

diff --git a/lib/thinking_sphinx/search.rb b/lib/thinking_sphinx/search.rb
@@ -544,7 +544,7 @@ def prepare(client)
       [
         :max_matches, :group_by, :group_function, :group_clause,
         :group_distinct, :id_range, :cut_off, :retry_count, :retry_delay,
-        :rank_mode, :max_query_time, :field_weights
+        :rank_mode, :rank_expr, :max_query_time, :field_weights
       ].each do |key|
         value = options[key] || index_options[key]
         client.send("#{key}=", value) if value