Use packaged snowplow-tracker and embedded elasticsearch-model

This commit is contained in:
Pirate Praveen 2019-12-04 22:04:48 +05:30
parent 845c9fc2fe
commit 7ecb891e8f
8 changed files with 16 additions and 29 deletions

3
debian/control vendored
View file

@ -263,8 +263,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
# Perf bar # Perf bar
ruby-peek (>= 1.0.1~), ruby-peek (>= 1.0.1~),
# Snowplow events tracking # Snowplow events tracking
# ruby-snowplow-tracker (>= 0.6.1~) currently embedded ruby-snowplow-tracker (>= 0.6.1~),
ruby-contracts,
# Memory benchmarks # Memory benchmarks
# derailed_benchmarks (embedded) # derailed_benchmarks (embedded)
ruby-benchmark-ips (>= 2~), ruby-benchmark-ips (>= 2~),

View file

@ -66,4 +66,4 @@ db var/lib/gitlab
core-js usr/share/gitlab/vendor/node_modules core-js usr/share/gitlab/vendor/node_modules
derailed-benchmarks usr/share/gitlab/vendor/gems derailed-benchmarks usr/share/gitlab/vendor/gems
heapy usr/share/gitlab/vendor/gems heapy usr/share/gitlab/vendor/gems
snowplow-tracker usr/share/gitlab/vendor/gems elasticsearch-model usr/share/gitlab/vendor/gems

View file

@ -0,0 +1,11 @@
--- a/Gemfile
+++ b/Gemfile
@@ -127,7 +127,7 @@
gem 'seed-fu', '~> 2.3', '>= 2.3.7'
# Search
-gem 'elasticsearch-model', '~> 0.1.9'
+gem 'elasticsearch-model', '~> 0.1.9', path: 'vendor/gems/elasticsearch-model'
gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation'
gem 'elasticsearch-api', '5.0.3'
gem 'aws-sdk'

View file

@ -1,11 +0,0 @@
--- a/Gemfile
+++ b/Gemfile
@@ -306,7 +306,7 @@
gem 'gitlab-peek', '~> 0.0.1', require: 'peek'
# Snowplow events tracking
-gem 'snowplow-tracker', '~> 0.6.1'
+gem 'snowplow-tracker', '~> 0.6.1', path: 'vendor/gems/snowplow-tracker'
# Memory benchmarks
gem 'derailed_benchmarks', require: false, path: 'vendor/gems/derailed-benchmarks'

View file

@ -1,11 +0,0 @@
--- a/snowplow-tracker/snowplow-tracker.gemspec
+++ b/snowplow-tracker/snowplow-tracker.gemspec
@@ -25,7 +25,7 @@
s.specification_version = 4
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<contracts>.freeze, ["<= 0.11", "~> 0.7"])
+ s.add_runtime_dependency(%q<contracts>.freeze, ["~> 0.7"])
s.add_development_dependency(%q<rspec>.freeze, ["~> 2.14.1"])
s.add_development_dependency(%q<webmock>.freeze, ["~> 1.17.4"])
else

View file

@ -5,7 +5,7 @@ Last-Update: 2019-11-19
--- a/Gemfile --- a/Gemfile
+++ b/Gemfile +++ b/Gemfile
@@ -64,7 +64,7 @@ @@ -61,7 +61,7 @@
# GitLab Pages # GitLab Pages
gem 'validates_hostname', '~> 1.0', '>= 1.0.6' gem 'validates_hostname', '~> 1.0', '>= 1.0.6'

View file

@ -8,8 +8,7 @@
0450-remove-bullet.patch 0450-remove-bullet.patch
0460-embed-derailed-benchmarks.patch 0460-embed-derailed-benchmarks.patch
0470-relax-bootsnap.patch 0470-relax-bootsnap.patch
0480-embed-snowplow-tracker.patch 0480-embed-elasticsearch-model.patch
0481-relax-contracts-dependency-of-snowplow.patch
0482-remove-ee-only-gems.patch 0482-remove-ee-only-gems.patch
0500-set-webpack-root.patch 0500-set-webpack-root.patch
0510-remove-dev-dependencies.patch 0510-remove-dev-dependencies.patch

View file

@ -67,6 +67,7 @@ derailed-benchmarks
doc doc
docker docker
docker-compose.yml docker-compose.yml
elasticsearch-model
fixtures fixtures
generator_templates generator_templates
haml_lint haml_lint
@ -83,7 +84,6 @@ rubocop
scripts scripts
security.txt security.txt
shared shared
snowplow-tracker
spec spec
symbol symbol
tmp tmp