Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update to Rails 3.0.0 beta4

  • Loading branch information...
commit 727dcd4a47d8a5981c333d2a8051ac24187c8a8e 1 parent fd2192b
Kieran Pilkington authored
10 Gemfile
View
@@ -1,9 +1,13 @@
source 'http://rubygems.org'
-gem 'rails', '3.0.0.beta3'
+gem 'rails', '3.0.0.beta4'
+gem 'sqlite3-ruby', :require => 'sqlite3'
+
gem 'mongrel'
+
gem 'less'
-gem 'virtualbox', '0.6.1'
gem 'delayed_job'
-gem 'sqlite3-ruby', :require => 'sqlite3'
gem 'archive-tar-minitar', '0.5.2'
+
+#gem 'virtualbox', '0.6.1'
+gem 'virtualbox', :path => '/Users/kieran/Work/mitchellh-virtualbox'
3  Rakefile
View
@@ -2,10 +2,7 @@
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
require File.expand_path('../config/application', __FILE__)
-
require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
begin
require 'delayed/tasks'
2  config/application.rb
View
@@ -5,7 +5,7 @@
require "action_controller/railtie"
# require "action_mailer/railtie"
# require "active_resource/railtie"
-require "rails/test_unit/railtie"
+# require "rails/test_unit/railtie"
# If you have a Gemfile, require the gems listed there, including any gems
# you've limited to :test, :development, or :production.
11 config/boot.rb
View
@@ -1,6 +1,13 @@
require 'rubygems'
+
# Set up gems listed in the Gemfile.
-if File.exist?(File.expand_path('../../Gemfile', __FILE__))
+gemfile = File.expand_path('../../Gemfile', __FILE__)
+begin
+ ENV['BUNDLE_GEMFILE'] = gemfile
require 'bundler'
Bundler.setup
-end
+rescue Bundler::GemNotFound => e
+ STDERR.puts e.message
+ STDERR.puts "Try running `bundle install`."
+ exit!
+end if File.exist?(gemfile)
4 config/environments/production.rb
View
@@ -39,4 +39,8 @@
# Enable threaded mode
# config.threadsafe!
+
+ # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+ # the I18n.default_locale when a translation can not be found)
+ config.i18n.fallbacks = true
end
2  config/initializers/inflections.rb
View
@@ -1,6 +1,6 @@
# Be sure to restart your server when you modify this file.
-# Add new inflection rules using the following format
+# Add new inflection rules using the following format
# (all these examples are active by default):
# ActiveSupport::Inflector.inflections do |inflect|
# inflect.plural /^(ox)$/i, '\1en'
4 config/initializers/secret_token.rb
View
@@ -2,6 +2,6 @@
# Your secret key for verifying the integrity of signed cookies.
# If you change this key, all old signed cookies will become invalid!
-# Make sure the secret is at least 30 characters and all random,
+# Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks.
-Rails.application.config.secret_token = 'dac71aebe40aba7f9990914a7ea1f1d8f68c691a1e17c8e2d07eb63fc70bc6dd205be7953ed84e07c7be9e7e338b71faba26de5b005598a876442d0c79729039'
+Rails.application.config.secret_token = 'e85dbf54487ffb47772e242aed7719148397a3ceaba437a28144d258bfee5d8b8719a9fce7aee49388ac803a7261387cf28b7c4546224c8781b39cd400a1f907'
7 script/rails
View
@@ -1,9 +1,6 @@
#!/usr/bin/env ruby
# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-ENV_PATH = File.expand_path('../../config/environment', __FILE__)
-BOOT_PATH = File.expand_path('../../config/boot', __FILE__)
-APP_PATH = File.expand_path('../../config/application', __FILE__)
-
-require BOOT_PATH
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require File.expand_path('../../config/boot', __FILE__)
require 'rails/commands'
Please sign in to comment.
Something went wrong with that request. Please try again.