diff --git a/config/boot.rb b/config/boot.rb index 484c2b5..6092eb5 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -108,7 +108,7 @@ end # yeah, I know, I shouldn't change this file. But ... def install_debian_rails local_rails = File.dirname(__FILE__) + '/../vendor/rails' - debian_rails = '/usr/share/rails' + debian_rails = '/usr/share/rails-ruby1.8' if !File.exist?(local_rails) && File.exists?(debian_rails) puts "I: Installing Debian-installed Rails from /usr/share/rails into vendor/rails." recommended_rails_version = Rails::GemBoot.gem_version diff --git a/config/environment.rb b/config/environment.rb index 077aca8..459a5da 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -5,7 +5,7 @@ #ENV['RAILS_ENV'] ||= 'production' # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.1.0' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') -- libgit2 0.21.2