From 7e5c36fbad7fdb42c0bd1dc5a0c7f051784852ad Mon Sep 17 00:00:00 2001 From: Jasper Maes Date: Mon, 17 Dec 2018 19:19:25 +0100 Subject: [PATCH] Fix deprecation: alias_method_chain is deprecated. Please, use Module#prepend instead --- Gemfile | 2 +- Gemfile.lock | 7 ++++--- changelogs/unreleased/deprecated-alias-method-chain.yml | 6 ++++++ 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 changelogs/unreleased/deprecated-alias-method-chain.yml diff --git a/Gemfile b/Gemfile index 9ce23e693d3..ad7ba1122fd 100644 --- a/Gemfile +++ b/Gemfile @@ -290,7 +290,7 @@ gem 'batch-loader', '~> 1.2.2' # Perf bar gem 'peek', '~> 1.0.1' gem 'peek-gc', '~> 0.0.2' -gem 'peek-mysql2', '~> 1.1.0', group: :mysql +gem 'peek-mysql2', '~> 1.2.0', group: :mysql gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' diff --git a/Gemfile.lock b/Gemfile.lock index b9780d4c23f..312ad95cd1e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -558,8 +558,9 @@ GEM railties (>= 4.0.0) peek-gc (0.0.2) peek - peek-mysql2 (1.1.0) - atomic (>= 1.0.0) + peek-mysql2 (1.2.0) + concurrent-ruby + concurrent-ruby-ext mysql2 peek peek-pg (1.3.0) @@ -1079,7 +1080,7 @@ DEPENDENCIES org-ruby (~> 0.9.12) peek (~> 1.0.1) peek-gc (~> 0.0.2) - peek-mysql2 (~> 1.1.0) + peek-mysql2 (~> 1.2.0) peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) diff --git a/changelogs/unreleased/deprecated-alias-method-chain.yml b/changelogs/unreleased/deprecated-alias-method-chain.yml new file mode 100644 index 00000000000..76dd016e4cc --- /dev/null +++ b/changelogs/unreleased/deprecated-alias-method-chain.yml @@ -0,0 +1,6 @@ +--- +title: 'Fix deprecation: alias_method_chain is deprecated. Please, use Module#prepend + instead' +merge_request: 23887 +author: Jasper Maes +type: other