@@ -6,9 +6,9 @@ require(File.join(File.dirname(__FILE__), 'config', 'boot')) require 'rake' require 'rake/testtask' require 'rake/rdoctask' - require 'tasks/rails' + desc "Copy application sample config for dev/test purposes" task :copy_sample_config do if Rails.env.development? or Rails.env.test? Rakefile @@ -16,7 +16,7 @@ class ApplicationController < ActionController::Base map_resource :profile, :singleton => true, :class => "User", :find => :current_user - protect_from_forgery + #protect_from_forgery def current_network subdomain = current_subdomain.downcase if current_subdomain app/controllers/application_controller.rb @@ -21,7 +21,7 @@ class SessionsController < ApplicationController update_balance_cookie handle_first_donation_for_non_logged_in_user handle_first_pledge_for_non_logged_in_user - + puts "whooooooo" if request.xhr? render :nothing => true else app/controllers/sessions_controller.rb @@ -16,7 +16,7 @@ - Network.all.each do |network| | - if @current_network != network - = link_to network.display_name, root_url(:subdomain => network.name) + = link_to network.display_name, "http://" + network.name + ".spot.us/" - else = network.display_name - if yield(:error) app/views/layouts/application.html.haml @@ -17,12 +17,13 @@ DEFAULT_HOST = APP_CONFIG[:default_host] || "spotus.local" Rails::Initializer.run do |config| config.gem "haml", :version => '>=2.0.6' config.gem "fastercsv" + config.gem "mysql", :version => '2.7' config.gem 'thoughtbot-factory_girl', :lib => 'factory_girl', :source => 'http://gems.github.com' config.gem "rubyist-aasm", :lib => "aasm", :version => '>=2.0.5', :source => 'http://gems.github.com' config.gem 'mislav-will_paginate', :lib => 'will_paginate', :version => '>=2.3.7', :source => 'http://gems.github.com/' config.gem "rspec-rails", :lib => false, :version => "= 1.2.2" config.gem "cucumber", :lib => false, :version => "= 0.1.16" - config.gem "webrat", :lib => false, :version => "= 0.4.4" + config.gem "webrat", :lib => false, :version => ">= 0.4.4" config.gem "money", :version => ">=2.1.3" config.time_zone = 'UTC' config/environment.rb 514d06232ce2617855d88b5730e75928e9ff25fd Dan Newman dpnewman@gmail.com http://github.com/spot-us/spot-us/commit/10ec05e1898bc68ecff937cbf5a5ed9237746243 10ec05e1898bc68ecff937cbf5a5ed9237746243 2009-09-15T19:04:54-07:00 2009-09-15T19:04:54-07:00 Just trying to get things working 89f38049c6e731f86cd9b877dd23f42eaf1ad2b2 Dan Newman dpnewman@gmail.com