Skip to content

Commit

Permalink
Merge pull request #16426 from dduugg/no-string-filters
Browse files Browse the repository at this point in the history
Remove ActiveSupport String filters
  • Loading branch information
MikeMcQuaid authored Jan 3, 2024
2 parents a782847 + b3522b3 commit 0555270
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 149 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
!**/vendor/bundle/ruby/*/gems/activesupport-*/lib/active_support/core_ext/object/deep_dup.rb
!**/vendor/bundle/ruby/*/gems/activesupport-*/lib/active_support/core_ext/object/duplicable.rb
!**/vendor/bundle/ruby/*/gems/activesupport-*/lib/active_support/core_ext/string/exclude.rb
!**/vendor/bundle/ruby/*/gems/activesupport-*/lib/active_support/core_ext/string/filters.rb
!**/vendor/bundle/ruby/*/gems/activesupport-*/lib/active_support/core_ext/string/indent.rb

# Ignore partially included gems where we don't need all files
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/completions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def self.command_options(command)
name = option.first
desc = option.second
if name.start_with? "--[no-]"
options[name.remove("[no-]")] = desc
options[name.gsub("[no-]", "")] = desc
options[name.sub("[no-]", "no-")] = desc
else
options[name] = desc
Expand Down
1 change: 0 additions & 1 deletion Library/Homebrew/global.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
require "active_support/core_ext/hash/deep_merge"
require "active_support/core_ext/hash/keys"
require "active_support/core_ext/string/exclude"
require "active_support/core_ext/string/filters"
require "active_support/core_ext/string/indent"

HOMEBREW_API_DEFAULT_DOMAIN = ENV.fetch("HOMEBREW_API_DEFAULT_DOMAIN").freeze
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/utils/gems.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module Homebrew

# Bump this whenever a committed vendored gem is later added to gitignore.
# This will trigger it to reinstall properly if `brew install-bundler-gems` needs it.
VENDOR_VERSION = 3
VENDOR_VERSION = 4
private_constant :VENDOR_VERSION

RUBY_BUNDLE_VENDOR_DIRECTORY = (HOMEBREW_LIBRARY_PATH/"vendor/bundle/ruby").freeze
Expand Down

This file was deleted.

0 comments on commit 0555270

Please sign in to comment.