Revert "Fix off-by-one error in user notes list"

[rails.git] / config / boot.rb

diff --git a/config/boot.rb b/config/boot.rb
index 9a094cbc6dc9302dc151346f15aec13f76973ef3..5e5f0c1fac0bcde58936530ada4fd08abcaf5a64 100644 (file)
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,44 +1,4 @@
-# Don't change this file. Configuration is done in config/environment.rb and config/environments/*.rb
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-unless defined?(RAILS_ROOT)
-  root_path = File.join(File.dirname(__FILE__), '..')
-
-  unless RUBY_PLATFORM =~ /mswin32/
-    require 'pathname'
-    root_path = Pathname.new(root_path).cleanpath(true).to_s
-  end
-
-  RAILS_ROOT = root_path
-end
-
-unless defined?(Rails::Initializer)
-  if File.directory?("#{RAILS_ROOT}/vendor/rails")
-    require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-  else
-    require 'rubygems'
-
-    environment_without_comments = IO.readlines(File.dirname(__FILE__) + '/environment.rb').reject { |l| l =~ /^#/ }.join
-    environment_without_comments =~ /[^#]RAILS_GEM_VERSION = '([\d.]+)'/
-    rails_gem_version = $1
-
-    if version = defined?(RAILS_GEM_VERSION) ? RAILS_GEM_VERSION : rails_gem_version
-      rails_gem = Gem.cache.search('rails', "=#{version}").first
-
-      if rails_gem
-        require_gem "rails", "=#{version}"
-        require rails_gem.full_gem_path + '/lib/initializer'
-      else
-        STDERR.puts %(Cannot find gem for Rails =#{version}:
-    Install the missing gem with 'gem install -v=#{version} rails', or
-    change environment.rb to define RAILS_GEM_VERSION with your desired version.
-  )
-        exit 1
-      end
-    else
-      require_gem "rails"
-      require 'initializer'
-    end
-  end
-
-  Rails::Initializer.run(:set_load_path)
-end
\ No newline at end of file
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])