Commit d10ffd4fd97003b638cb93821dcab3c86a2abba5
1 parent
c1dcbde8
Exists in
master
and in
17 other branches
Fixed circular dependency warning [skip ci]
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
lib/searchkick.rb
| @@ -49,7 +49,7 @@ module Searchkick | @@ -49,7 +49,7 @@ module Searchkick | ||
| 49 | 49 | ||
| 50 | def self.client | 50 | def self.client |
| 51 | @client ||= begin | 51 | @client ||= begin |
| 52 | - require "typhoeus/adapters/faraday" if defined?(Typhoeus) | 52 | + require "typhoeus/adapters/faraday" if defined?(Typhoeus) && Gem::Version.new(Faraday::VERSION) < Gem::Version.new("0.14.0") |
| 53 | 53 | ||
| 54 | Elasticsearch::Client.new({ | 54 | Elasticsearch::Client.new({ |
| 55 | url: ENV["ELASTICSEARCH_URL"], | 55 | url: ENV["ELASTICSEARCH_URL"], |