Commit 1aab689d authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents be38173b 7a143215
......@@ -304,7 +304,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'
......
......@@ -587,8 +587,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)
......@@ -1116,7 +1117,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)
......
---
title: 'Fix deprecation: alias_method_chain is deprecated. Please, use Module#prepend
instead'
merge_request: 23887
author: Jasper Maes
type: other
---
title: 'Fix deprecation: Directly inheriting from ActiveRecord::Migration is deprecated.'
merge_request: 23884
author: Jasper Maes
type: other
# frozen_string_literal: true
class CreateSuggestions < ActiveRecord::Migration
class CreateSuggestions < ActiveRecord::Migration[5.0]
DOWNTIME = false
def change
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment