From 5aaaf0be6cc4a9b2bc847fa72f42708ce478f82b Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Tue, 23 May 2023 09:47:39 +0200 Subject: [PATCH 1/2] Revert "Merge pull request #4621 from dodona-edu/dependabot/bundler/ddtrace-1.11.1" This reverts commit 541c553414e84940565c53c905a343bf3728e165, reversing changes made to 48b3fbd1c7d795f1827c79187ce25e397f56064c. --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 38f30c2a25..21cef275e8 100644 --- a/Gemfile +++ b/Gemfile @@ -135,7 +135,7 @@ gem 'memory_profiler', '~> 1.0.1' gem 'rack-mini-profiler', '~> 3.0.0' gem 'stackprof', '~> 0.2.25' -gem 'ddtrace', '~> 1.11.1' +gem 'ddtrace', '~> 1.11.0' # Make sure filesystem changes only happen at the end of a transaction gem 'after_commit_everywhere', '~> 1.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index 8e477b5a6f..ae021197ba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -133,7 +133,7 @@ GEM daemons (1.4.1) dalli (3.2.4) date (3.3.3) - ddtrace (1.11.1) + ddtrace (1.11.0) debase-ruby_core_source (>= 0.10.16, <= 3.2.0) libdatadog (~> 2.0.0.1.0) libddwaf (~> 1.8.2.0.0) @@ -528,7 +528,7 @@ DEPENDENCIES counter_culture (~> 3.2) cssbundling-rails (~> 1.1.2) dalli (~> 3.2.4) - ddtrace (~> 1.11.1) + ddtrace (~> 1.11.0) delayed_job_active_record (~> 4.1.7) delayed_job_web (~> 1.4.4) devise (~> 4.9.2) From 360d43cf33be3ef86e1351acd5ece1b7b42afebb Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Tue, 23 May 2023 09:48:04 +0200 Subject: [PATCH 2/2] Revert "Merge pull request #4602 from dodona-edu/dependabot/bundler/ddtrace-1.11.0" This reverts commit d112293b75cf54ccc1f5b126c8b7ca7dd600ddf9, reversing changes made to 8b1b63a55a67700de95ee17c7795d992dc88d7ad. --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 21cef275e8..24936a1695 100644 --- a/Gemfile +++ b/Gemfile @@ -135,7 +135,7 @@ gem 'memory_profiler', '~> 1.0.1' gem 'rack-mini-profiler', '~> 3.0.0' gem 'stackprof', '~> 0.2.25' -gem 'ddtrace', '~> 1.11.0' +gem 'ddtrace', '~> 1.10.1' # Make sure filesystem changes only happen at the end of a transaction gem 'after_commit_everywhere', '~> 1.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index ae021197ba..ae5eed4a56 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -133,10 +133,10 @@ GEM daemons (1.4.1) dalli (3.2.4) date (3.3.3) - ddtrace (1.11.0) + ddtrace (1.10.1) debase-ruby_core_source (>= 0.10.16, <= 3.2.0) libdatadog (~> 2.0.0.1.0) - libddwaf (~> 1.8.2.0.0) + libddwaf (~> 1.6.2.0.0) msgpack debase-ruby_core_source (3.2.0) delayed_job (4.1.10) @@ -237,7 +237,7 @@ GEM letter_opener (1.8.1) launchy (>= 2.2, < 3) libdatadog (2.0.0.1.0-x86_64-linux) - libddwaf (1.8.2.0.0-x86_64-linux) + libddwaf (1.6.2.0.0-x86_64-linux) ffi (~> 1.0) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) @@ -266,7 +266,7 @@ GEM minitest mocha (2.0.2) ruby2_keywords (>= 0.0.5) - msgpack (1.7.0) + msgpack (1.6.1) multi_json (1.15.0) multi_xml (0.6.0) mustermann (3.0.0) @@ -528,7 +528,7 @@ DEPENDENCIES counter_culture (~> 3.2) cssbundling-rails (~> 1.1.2) dalli (~> 3.2.4) - ddtrace (~> 1.11.0) + ddtrace (~> 1.10.1) delayed_job_active_record (~> 4.1.7) delayed_job_web (~> 1.4.4) devise (~> 4.9.2)