diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-02-06 17:35:33 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-02-06 17:35:33 +0300 |
| commit | de4b915177aefe2aa214ecdcf107b21d227adf62 (patch) | |
| tree | 2ea507d969cd409e2b0c9c5fc0611313cc6cba3d | |
| parent | 8a549719107d4acfe843289ceed388113997c396 (diff) | |
Remove deprecation warning for ActiveSupport
| -rw-r--r-- | ruby/lib/gitaly_server/conflicts_service.rb | 2 | ||||
| -rw-r--r-- | ruby/lib/gitlab/git.rb | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/ruby/lib/gitaly_server/conflicts_service.rb b/ruby/lib/gitaly_server/conflicts_service.rb index f0e5a7cef..90d3a762b 100644 --- a/ruby/lib/gitaly_server/conflicts_service.rb +++ b/ruby/lib/gitaly_server/conflicts_service.rb @@ -1,5 +1,3 @@ -require 'active_support/core_ext/hash/indifferent_access' - module GitalyServer class ConflictsService < Gitaly::ConflictsService::Service include Utils diff --git a/ruby/lib/gitlab/git.rb b/ruby/lib/gitlab/git.rb index f1ed275f6..ef8be707c 100644 --- a/ruby/lib/gitlab/git.rb +++ b/ruby/lib/gitlab/git.rb @@ -9,7 +9,6 @@ require 'active_support/core_ext/numeric/bytes' require 'active_support/core_ext/numeric/time' require 'active_support/core_ext/integer/time' require 'active_support/core_ext/module/delegation' -require 'active_support/core_ext/hash/transform_values' require 'active_support/core_ext/enumerable' require_relative 'git_logger.rb' |