Patch from bug #2787 to add icons to data browser pages

[rails.git] / config / boot.rb

diff --git a/config/boot.rb b/config/boot.rb
index 0a516880cadc333d0efc41367a56a09dd0654e87..9759b93f3845b7a9f45636e979b0e85024fbd6b6 100644 (file)
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -44,6 +44,7 @@ module Rails
     def load_initializer
       require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
       Rails::Initializer.run(:install_gem_spec_stubs)
     def load_initializer
       require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
       Rails::Initializer.run(:install_gem_spec_stubs)

+      Rails::GemDependency.add_frozen_gem_path

     end
   end
 
     end
   end
 


@@ -81,8 +82,8 @@ module Rails
       end
 
       def load_rubygems
       end
 
       def load_rubygems

-        require 'rubygems'

         min_version = '1.3.1'
         min_version = '1.3.1'

+        require 'rubygems'

         unless rubygems_version >= min_version
           $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
           exit 1
         unless rubygems_version >= min_version
           $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
           exit 1