diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2020-02-06 19:10:00 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2020-02-06 19:10:00 +0300 |
| commit | cf6c950c53214f8331d8585bcb4af0e8fc9fe215 (patch) | |
| tree | 4557db28ea83818a572b396d89129300b25a7344 | |
| parent | f72db292cb098caae5a9f69eb4b6900c56faa7c9 (diff) | |
| parent | de4b915177aefe2aa214ecdcf107b21d227adf62 (diff) | |
Merge branch 'zj-remove-deprecation-warning-activesupport' into 'master'
Remove deprecation warning for ActiveSupport
See merge request gitlab-org/gitaly!1809
| -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' |