Permalink
Browse files

Upgrade to Rails 3.0.6

* Patch critical security flaws described in http://weblog.rubyonrails.org/2011/4/6/rails-3-0-6-has-been-released
* Rename application to TravisCi to avoid namespace conflicts with Travis library and make future Rails upgrades easier
  • Loading branch information...
1 parent 2edb0f6 commit 8ded6be4e7edefdfbd46ed32a22bdc25d2e9cb92 @sferik sferik committed Apr 10, 2011
View
@@ -1,8 +1,9 @@
.DS_Store
.bundle
db/*.sqlite3
+db/*.sqlite3-journal
log/*.log
-tmp/**/*
+tmp/
vendor/htmlunit
config/resque.god
config/travis.yml
View
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '~> 3.0.5'
+gem 'rails', '~> 3.0.6'
gem 'SystemTimer', '~> 1.2.2', :platforms => ['ruby_18']
gem 'compass', '~> 0.10.6'
View
@@ -20,32 +20,32 @@ GEM
specs:
SystemTimer (1.2.2)
abstract (1.0.0)
- actionmailer (3.0.5)
- actionpack (= 3.0.5)
+ actionmailer (3.0.6)
+ actionpack (= 3.0.6)
mail (~> 2.2.15)
- actionpack (3.0.5)
- activemodel (= 3.0.5)
- activesupport (= 3.0.5)
+ actionpack (3.0.6)
+ activemodel (= 3.0.6)
+ activesupport (= 3.0.6)
builder (~> 2.1.2)
erubis (~> 2.6.6)
- i18n (~> 0.4)
+ i18n (~> 0.5.0)
rack (~> 1.2.1)
- rack-mount (~> 0.6.13)
+ rack-mount (~> 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
- activemodel (3.0.5)
- activesupport (= 3.0.5)
+ activemodel (3.0.6)
+ activesupport (= 3.0.6)
builder (~> 2.1.2)
- i18n (~> 0.4)
- activerecord (3.0.5)
- activemodel (= 3.0.5)
- activesupport (= 3.0.5)
+ i18n (~> 0.5.0)
+ activerecord (3.0.6)
+ activemodel (= 3.0.6)
+ activesupport (= 3.0.6)
arel (~> 2.0.2)
tzinfo (~> 0.3.23)
- activeresource (3.0.5)
- activemodel (= 3.0.5)
- activesupport (= 3.0.5)
- activesupport (3.0.5)
+ activeresource (3.0.6)
+ activemodel (= 3.0.6)
+ activesupport (= 3.0.6)
+ activesupport (3.0.6)
addressable (2.2.4)
archive-tar-minitar (0.5.2)
arel (2.0.9)
@@ -147,22 +147,22 @@ GEM
json (~> 1.4.0)
ruby-hmac (~> 0.4.0)
signature (~> 0.1.2)
- rack (1.2.1)
- rack-mount (0.6.13)
+ rack (1.2.2)
+ rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
rack (>= 1.0)
- rails (3.0.5)
- actionmailer (= 3.0.5)
- actionpack (= 3.0.5)
- activerecord (= 3.0.5)
- activeresource (= 3.0.5)
- activesupport (= 3.0.5)
+ rails (3.0.6)
+ actionmailer (= 3.0.6)
+ actionpack (= 3.0.6)
+ activerecord (= 3.0.6)
+ activeresource (= 3.0.6)
+ activesupport (= 3.0.6)
bundler (~> 1.0)
- railties (= 3.0.5)
- railties (3.0.5)
- actionpack (= 3.0.5)
- activesupport (= 3.0.5)
+ railties (= 3.0.6)
+ railties (3.0.6)
+ actionpack (= 3.0.6)
+ activesupport (= 3.0.6)
rake (>= 0.8.7)
thor (~> 0.14.4)
rake (0.8.7)
@@ -215,7 +215,7 @@ GEM
ruby-hmac (~> 0.4.0)
treetop (1.4.9)
polyglot (>= 0.3.1)
- tzinfo (0.3.24)
+ tzinfo (0.3.26)
unobtrusive_flash (0.0.2)
vegas (0.1.8)
rack (>= 1.0.0)
@@ -248,7 +248,7 @@ DEPENDENCIES
mocha
oa-oauth (~> 0.2.1)
pusher (~> 0.8.0)
- rails (~> 3.0.5)
+ rails (~> 3.0.6)
refraction (~> 0.2.0)
resque (~> 1.13.0)
resque-meta (~> 1.0.3)
View
@@ -3,7 +3,6 @@
require File.expand_path('../config/application', __FILE__)
require 'rake'
-
require 'resque/tasks'
-Travis::Application.load_tasks
+TravisCi::Application.load_tasks
@@ -30,6 +30,6 @@ def jobs
helper_method :jobs
def set_gitsha_header
- headers['X-GIT_SHA'] = Travis::Application::GIT_SHA
+ headers['X-GIT_SHA'] = TravisCi::Application::GIT_SHA
end
end
View
@@ -1,4 +1,4 @@
# This file is used by Rack-based servers to start the application.
require ::File.expand_path('../config/environment', __FILE__)
-run Travis::Application
+run TravisCi::Application
View
@@ -3,7 +3,7 @@
require 'rails/all'
Bundler.require(:default, Rails.env) if defined?(Bundler)
-module Travis
+module TravisCi
class Application < Rails::Application
GIT_SHA = `git rev-parse HEAD`.chomp
View
@@ -1,13 +1,6 @@
require 'rubygems'
# Set up gems listed in the Gemfile.
-gemfile = File.expand_path('../../Gemfile', __FILE__)
-begin
- ENV['BUNDLE_GEMFILE'] = gemfile
- require 'bundler'
- Bundler.setup
-rescue Bundler::GemNotFound => e
- STDERR.puts e.message
- STDERR.puts "Try running `bundle install`."
- exit!
-end if File.exist?(gemfile)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
View
@@ -2,4 +2,4 @@
require File.expand_path('../application', __FILE__)
# Initialize the rails application
-Travis::Application.initialize!
+TravisCi::Application.initialize!
@@ -1,4 +1,4 @@
-Travis::Application.configure do
+TravisCi::Application.configure do
# Settings specified here will take precedence over those in config/application.rb
# In the development environment your application's code is reloaded on
@@ -23,3 +23,4 @@
# Only use best-standards-support built into browsers
config.action_dispatch.best_standards_support = :builtin
end
+
@@ -1,4 +1,4 @@
-Travis::Application.configure do
+TravisCi::Application.configure do
# Settings specified here will take precedence over those in config/application.rb
# The test environment is used exclusively to run your application's
@@ -1,4 +1,4 @@
-Travis::Application.configure do
+TravisCi::Application.configure do
# Settings specified here will take precedence over those in config/application.rb
# The production environment is meant for finished, "live" apps.
@@ -1,4 +1,4 @@
-Travis::Application.configure do
+TravisCi::Application.configure do
# Settings specified here will take precedence over those in config/application.rb
# The test environment is used exclusively to run your application's
@@ -6,7 +6,7 @@
end
# Serve both compass css and jammit javascript from the tmp directory
-Travis::Application.config.middleware.insert_before(
+TravisCi::Application.config.middleware.insert_before(
'Rack::Sendfile',
'ActionDispatch::Static',
"#{Rails.root}/tmp/assets"
@@ -4,4 +4,4 @@
# If you change this key, all old signed cookies will become invalid!
# Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks.
-Travis::Application.config.secret_token = '0be1bc014443b7d0ec43d18363ea201fb875eb34cd8e736f92a94fdd31db53441b3a6cf2a1e2aef9518f2a5384641b02da4128dc1d79319b49cbb94ac6bdcc4b'
+TravisCi::Application.config.secret_token = '0be1bc014443b7d0ec43d18363ea201fb875eb34cd8e736f92a94fdd31db53441b3a6cf2a1e2aef9518f2a5384641b02da4128dc1d79319b49cbb94ac6bdcc4b'
@@ -1,8 +1,8 @@
# Be sure to restart your server when you modify this file.
-Travis::Application.config.session_store :cookie_store, :key => '_travis_session'
+TravisCi::Application.config.session_store :cookie_store, :key => '_travis_session'
# Use the database for sessions instead of the cookie-based default,
# which shouldn't be used to store highly confidential information
# (create the session table with "rails generate session_migration")
-# Travis::Application.config.session_store :active_record_store
+# TravisCi::Application.config.session_store :active_record_store
View
@@ -1,2 +1,5 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
en:
- hello_world: "Hello World"
+ hello: "Hello world"
View
@@ -1,4 +1,4 @@
-Travis::Application.routes.draw do
+TravisCi::Application.routes.draw do
devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
as :user do
View
No changes.
No changes.
@@ -0,0 +1,9 @@
+require 'test_helper'
+require 'rails/performance_test_help'
+
+# Profiling results for each test method are written to tmp/performance.
+class BrowsingTest < ActionDispatch::PerformanceTest
+ def test_homepage
+ get '/'
+ end
+end
View
No changes.

0 comments on commit 8ded6be

Please sign in to comment.