@@ -1,3 +1,6 @@ +require 'rubygems' +require 'aasm' + # Be sure to restart your server when you modify this file # Uncomment below to force Rails into production mode when @@ -5,7 +8,7 @@ # ENV['RAILS_ENV'] ||= 'production' # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.1.1' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.1.2' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') @@ -20,13 +23,7 @@ Rails::Initializer.run do |config| # you must remove the Active Record framework. # config.frameworks -= [ :active_record, :active_resource, :action_mailer ] - # Specify gems that this application depends on. - # They can then be installed with "rake gems:install" on new installations. - # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net" - # config.gem "aws-s3", :lib => "aws/s3" -config.gem "capistrano-ext", :lib => "capistrano" - - # Only load the plugins named here, in the order given. By default, all plugins + # Only load the plugins named here, in the order given. By default, all plugins # in vendor/plugins are loaded in alphabetical order. # :all can be used as a placeholder for all plugins not explicitly named # config.plugins = [ :exception_notification, :ssl_requirement, :all ] @@ -45,7 +42,7 @@ config.gem "capistrano-ext", :lib => "capistrano" # Your secret key for verifying cookie session data integrity. # If you change this key, all old sessions 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. config.action_controller.session = { :session_key => '_bort_session', config/environment.rb @@ -15,6 +15,9 @@ gems: # # require name is different than the gem name # require_name: foo-bar + - name: 'rails' + version: '2.1.2' + - name: 'config_reader' version: '0.0.2' load: true @@ -22,9 +25,8 @@ gems: - name: 'rspec-rails' version: '1.1.11' - # the version of rcov that doesn't segfualt all the time - name: 'mergulhao-rcov' - versoin: '0.8.1.3.0' + version: '0.8.1.3.0' source: 'http://gems.github.com' - name: 'capistrano' @@ -38,11 +40,13 @@ gems: load: true - name: 'mislav-will_paginate' + require_name: 'will_paginate' version: '2.3.6' load: true source: 'http://gems.github.com' - name: 'rubyist-aasm' + require_name: 'aasm' version: '2.0.2' laod: true source: 'http://gems.github.com' config/gems.yml @@ -73,7 +73,7 @@ ActiveRecord::Schema.define(:version => 20081022002158) do t.string "salt", :limit => 40 t.string "remember_token", :limit => 40 t.string "activation_code", :limit => 40 - t.string "state", :default => "passive" + t.string "state", :default => "passive", :null => false t.datetime "remember_token_expires_at" t.datetime "activated_at" t.datetime "deleted_at" db/schema.rb 611558d71e4edc3a129f972155eec5d75cdb3d39 Michael Moen michael@underpantsgnome.com http://github.com/UnderpantsGnome/bort/commit/405719b0a8e6f6b7c98f43c41b48d4435f78c68c 405719b0a8e6f6b7c98f43c41b48d4435f78c68c 2008-11-09T11:53:59-08:00 2008-11-09T11:53:59-08:00 fix the gem silliness d8c7d26e5d4b0739b15386b4f92145d0011cc98a Michael Moen michael@underpantsgnome.com