diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-12-18 10:10:01 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-12-18 10:10:01 +0000 |
| commit | 3146bb5c0bd42649e8132a736733b9b0484baaa0 (patch) | |
| tree | d41ce5b033f95e81387aa38e89f68075b6147d92 | |
| parent | f3d80159fcfa3c1e4d5a6d3c747ef89293288621 (diff) | |
| parent | 7e5c36fbad7fdb42c0bd1dc5a0c7f051784852ad (diff) | |
| download | gitlab-ce-3146bb5c0bd42649e8132a736733b9b0484baaa0.tar.gz | |
Merge branch 'deprecated-alias-method-chain' into 'master'
Fix deprecation: alias_method_chain is deprecated. Please, use Module#prepend instead
See merge request gitlab-org/gitlab-ce!23887
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 7 | ||||
| -rw-r--r-- | changelogs/unreleased/deprecated-alias-method-chain.yml | 6 |
3 files changed, 11 insertions, 4 deletions
@@ -292,7 +292,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 832508e11d2..6d21089c82c 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 |