Skip to content

Commit 67ea513

Browse files
committed
[RAILS] Changed the dependency on "elasticsearch-model" from local to Rubygems
Otherwise, Bundler is stuck in endless "Resolving dependencies" loop.
1 parent 91814b3 commit 67ea513

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

elasticsearch-rails/Gemfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ source 'https://rubygems.org'
33
# Specify your gem's dependencies in elasticsearch-rails.gemspec
44
gemspec
55

6-
if File.exists? File.expand_path("../../elasticsearch-model", __FILE__)
7-
gem 'elasticsearch-model', :path => File.expand_path("../../elasticsearch-model", __FILE__), :require => true
8-
end
6+
# TODO: Figure out how to specify dependency on local elasticsearch-model without endless "Resolving dependencies"
7+
# if File.exists? File.expand_path("../../elasticsearch-model", __FILE__)
8+
# gem 'elasticsearch-model', :path => File.expand_path("../../elasticsearch-model", __FILE__), :require => true
9+
# end

elasticsearch-rails/elasticsearch-rails.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
2727
s.add_development_dependency "rake"
2828

2929
s.add_development_dependency "elasticsearch-extensions"
30+
s.add_development_dependency "elasticsearch-model"
3031

3132
s.add_development_dependency "oj"
3233
s.add_development_dependency "rails", "> 3.0"

0 commit comments

Comments
 (0)