diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/dsl.rb | 7 | ||||
| -rw-r--r-- | lib/bundler/feature_flag.rb | 4 | ||||
| -rw-r--r-- | lib/bundler/settings.rb | 1 |
3 files changed, 2 insertions, 10 deletions
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb index d3ead2a1ff..534c9b5537 100644 --- a/lib/bundler/dsl.rb +++ b/lib/bundler/dsl.rb @@ -291,12 +291,7 @@ module Bundler "https://github.com/#{repo_name}.git" RUBY repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") - if Bundler.feature_flag.github_https? - "https://github.com/#{repo_name}.git" - else - Bundler::SharedHelpers.major_deprecation 2, "Setting `github.https` to false is deprecated and won't be supported in the future." - "git://github.com/#{repo_name}.git" - end + "https://github.com/#{repo_name}.git" end git_source(:gist) do |repo_name| diff --git a/lib/bundler/feature_flag.rb b/lib/bundler/feature_flag.rb index 07106abad7..9cc14c9bc8 100644 --- a/lib/bundler/feature_flag.rb +++ b/lib/bundler/feature_flag.rb @@ -44,7 +44,7 @@ module Bundler settings_flag(:plugins) { @bundler_version >= Gem::Version.new("1.14") } settings_flag(:print_only_version_number) { bundler_3_mode? } settings_flag(:setup_makes_kernel_gem_public) { !bundler_3_mode? } - settings_flag(:skip_default_git_sources) { bundler_4_mode? } + settings_flag(:skip_default_git_sources) { bundler_3_mode? } settings_flag(:specific_platform) { bundler_3_mode? } settings_flag(:suppress_install_using_messages) { bundler_3_mode? } settings_flag(:unlock_source_unlocks_spec) { !bundler_3_mode? } @@ -53,8 +53,6 @@ module Bundler settings_option(:default_cli_command) { bundler_3_mode? ? :cli_help : :install } - settings_method(:github_https?, "github.https") { bundler_2_mode? } - def initialize(bundler_version) @bundler_version = Gem::Version.create(bundler_version) end diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb index 2d0c4174ae..6cc25bc998 100644 --- a/lib/bundler/settings.rb +++ b/lib/bundler/settings.rb @@ -33,7 +33,6 @@ module Bundler frozen gem.coc gem.mit - github.https global_path_appends_ruby_scope global_gem_cache ignore_messages |