kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Rémy Coutable 2018-12-18 10:10:01 +00:00
parent f3d80159fc 7e5c36fbad
commit 3146bb5c0b
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -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'

7
Gemfile.lock
View File

@ -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)

6
changelogs/unreleased/deprecated-alias-method-chain.yml Normal file
View File

@ -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