Update elasticsearch* dependencies
This commit is contained in:
parent
27aecb2bbb
commit
fdbc192148
4 changed files with 14 additions and 4 deletions
6
debian/control
vendored
6
debian/control
vendored
|
@ -127,6 +127,12 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
|
||||||
ruby-unf-ext (>= 0.0.7.4),
|
ruby-unf-ext (>= 0.0.7.4),
|
||||||
# Seed data
|
# Seed data
|
||||||
ruby-seed-fu (>= 2.3.7~),
|
ruby-seed-fu (>= 2.3.7~),
|
||||||
|
# Search
|
||||||
|
# ruby-elasticsearch-model (>= 0.1.9~), embedded
|
||||||
|
# ruby-elasticsearch-rails (>= 0.1.9~), embedded
|
||||||
|
ruby-elasticsearch-api (>= 5.0.3~),
|
||||||
|
ruby-aws-sdk,
|
||||||
|
# ruby-faraday-middleware-aws-signers-v4, embedded
|
||||||
# Markdown and HTML processing
|
# Markdown and HTML processing
|
||||||
ruby-html-pipeline (>= 2.8~),
|
ruby-html-pipeline (>= 2.8~),
|
||||||
ruby-task-list (>= 2.2~),
|
ruby-task-list (>= 2.2~),
|
||||||
|
|
8
debian/patches/0050-relax-stable-libs.patch
vendored
8
debian/patches/0050-relax-stable-libs.patch
vendored
|
@ -123,7 +123,7 @@ gitlab Gemfile
|
||||||
gem 'fog-google', '~> 1.9'
|
gem 'fog-google', '~> 1.9'
|
||||||
gem 'fog-local', '~> 0.6'
|
gem 'fog-local', '~> 0.6'
|
||||||
gem 'fog-openstack', '~> 1.0'
|
gem 'fog-openstack', '~> 1.0'
|
||||||
@@ -125,7 +125,7 @@
|
@@ -125,46 +125,46 @@
|
||||||
gem 'unf', '~> 0.1.4'
|
gem 'unf', '~> 0.1.4'
|
||||||
|
|
||||||
# Seed data
|
# Seed data
|
||||||
|
@ -132,7 +132,11 @@ gitlab Gemfile
|
||||||
|
|
||||||
# Search
|
# Search
|
||||||
gem 'elasticsearch-model', '~> 0.1.9'
|
gem 'elasticsearch-model', '~> 0.1.9'
|
||||||
@@ -136,35 +136,35 @@
|
gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation'
|
||||||
|
-gem 'elasticsearch-api', '5.0.3'
|
||||||
|
+gem 'elasticsearch-api', '~> 5.0', '>= 5.0.3'
|
||||||
|
gem 'aws-sdk'
|
||||||
|
gem 'faraday_middleware-aws-signers-v4'
|
||||||
|
|
||||||
# Markdown and HTML processing
|
# Markdown and HTML processing
|
||||||
gem 'html-pipeline', '~> 2.8'
|
gem 'html-pipeline', '~> 2.8'
|
||||||
|
|
|
@ -7,5 +7,5 @@
|
||||||
-gem 'elasticsearch-model', '~> 0.1.9'
|
-gem 'elasticsearch-model', '~> 0.1.9'
|
||||||
+gem 'elasticsearch-model', '~> 0.1.9', path: 'vendor/gems/elasticsearch-model'
|
+gem 'elasticsearch-model', '~> 0.1.9', path: 'vendor/gems/elasticsearch-model'
|
||||||
gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation'
|
gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation'
|
||||||
gem 'elasticsearch-api', '5.0.3'
|
gem 'elasticsearch-api', '~> 5.0', '>= 5.0.3'
|
||||||
gem 'aws-sdk'
|
gem 'aws-sdk'
|
||||||
|
|
|
@ -6,6 +6,6 @@
|
||||||
gem 'elasticsearch-model', '~> 0.1.9', path: 'vendor/gems/elasticsearch-model'
|
gem 'elasticsearch-model', '~> 0.1.9', path: 'vendor/gems/elasticsearch-model'
|
||||||
-gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation'
|
-gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation'
|
||||||
+gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails'
|
+gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails'
|
||||||
gem 'elasticsearch-api', '5.0.3'
|
gem 'elasticsearch-api', '~> 5.0', '>= 5.0.3'
|
||||||
gem 'aws-sdk'
|
gem 'aws-sdk'
|
||||||
gem 'faraday_middleware-aws-signers-v4'
|
gem 'faraday_middleware-aws-signers-v4'
|
||||||
|
|
Loading…
Reference in a new issue