mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	Merge 2-0-stable branch from bundler/bundler.
It's release version of Bundler 2 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66204 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
		
							parent
							
								
									76d9da900a
								
							
						
					
					
						commit
						cfa6c55347
					
				
					 3 changed files with 3 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -7,7 +7,7 @@ module Bundler
 | 
			
		|||
  # We're doing this because we might write tests that deal
 | 
			
		||||
  # with other versions of bundler and we are unsure how to
 | 
			
		||||
  # handle this better.
 | 
			
		||||
  VERSION = "2.0.0.pre.2" unless defined?(::Bundler::VERSION)
 | 
			
		||||
  VERSION = "2.0.0" unless defined?(::Bundler::VERSION)
 | 
			
		||||
 | 
			
		||||
  def self.overwrite_loaded_gem_version
 | 
			
		||||
    begin
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -79,7 +79,7 @@ Usage: "bundle inject GEM VERSION"
 | 
			
		|||
  context "when frozen" do
 | 
			
		||||
    before do
 | 
			
		||||
      bundle "install"
 | 
			
		||||
      if Bundler.feature_flag.bundler_2_mode?
 | 
			
		||||
      if Bundler.feature_flag.bundler_3_mode?
 | 
			
		||||
        bundle! "config --local deployment true"
 | 
			
		||||
      else
 | 
			
		||||
        bundle! "config --local frozen true"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -188,7 +188,7 @@ RSpec.describe "real world edgecases", :realworld => true, :sometimes => true do
 | 
			
		|||
            activemodel (= 4.2.7.1)
 | 
			
		||||
            activerecord (= 4.2.7.1)
 | 
			
		||||
            activesupport (= 4.2.7.1)
 | 
			
		||||
            bundler (>= 1.3.0, < 2.0)
 | 
			
		||||
            bundler (>= 1.3.0, < 3.0)
 | 
			
		||||
            railties (= 4.2.7.1)
 | 
			
		||||
            sprockets-rails
 | 
			
		||||
          rails-deprecated_sanitizer (1.0.3)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue