|
|
||
$ svn diff
Index: app/controllers/application.rb
===================================================================
--- app/controllers/application.rb (revision 32)
+++ app/controllers/application.rb (working copy)
@@ -1,6 +1,7 @@
# Filters added to this controller apply to all controllers in the application.
# Likewise, all the methods added will be available for all controllers.
+require 'gettext/rails'
class ApplicationController < ActionController::Base
include AuthenticatedSystem
protect_from_forgery
Index: config/boot.rb
===================================================================
--- config/boot.rb (revision 32)
+++ config/boot.rb (working copy)
@@ -24,9 +24,8 @@
File.exist?("#{RAILS_ROOT}/vendor/rails")
end
- # FIXME : Ruby 1.9
def preinitialize
- load(preinitializer_path) if File.exists?(preinitializer_path)
+ load(preinitializer_path) if File.exist?(preinitializer_path)
end
def preinitializer_path
@@ -44,6 +43,7 @@
class VendorBoot < Boot
def load_initializer
require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+ Rails::Initializer.run(:install_gem_spec_stubs)
end
end
@@ -82,14 +82,14 @@
def load_rubygems
require 'rubygems'
-
- unless rubygems_version >= '0.9.4'
- $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.)
+ min_version = '1.1.1'
+ unless rubygems_version >= min_version
+ $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
exit 1
end
rescue LoadError
- $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+ $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
exit 1
end
Index: config/environment.rb
===================================================================
--- config/environment.rb (revision 32)
+++ config/environment.rb (working copy)
@@ -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.0.2' 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')
Index: public/javascripts/effects.js
===================================================================
--- public/javascripts/effects.js (revision 32)
+++ public/javascripts/effects.js (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// Contributors:
// Justin Palmer (http://encytemedia.com/)
// Mark Pilgrim (http://diveintomark.org/)
Index: public/javascripts/dragdrop.js
===================================================================
--- public/javascripts/dragdrop.js (revision 32)
+++ public/javascripts/dragdrop.js (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
//
// script.aculo.us is freely distributable under the terms of an MIT-style license.
Index: public/javascripts/controls.js
===================================================================
--- public/javascripts/controls.js (revision 32)
+++ public/javascripts/controls.js (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
// (c) 2005-2007 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
// (c) 2005-2007 Jon Tirsen (http://www.tirsen.com)
// Contributors:
Kaedn2011/05/04 16:31Ppl like you get all the brains. I just get to say thanks for he awnser.
fvdgxzjruj2011/05/05 11:15Od3xKu <a href="http://iexzrpeaxnnv.com/">iexzrpeaxnnv</a>
stkwvsoqvl2011/05/06 10:28PhR64j , [url=http://zhtpriauytiz.com/]zhtpriauytiz[/url], [link=http://vjcmlklblycd.com/]vjcmlklblycd[/link], http://gyxvzsriamuc.com/
czkmoexw2011/05/07 13:21AUMHrT <a href="http://tsnhjhxhdbhz.com/">tsnhjhxhdbhz</a>
axzawdcux2011/05/08 13:43F4J6WA , [url=http://mvtoyxgjagfr.com/]mvtoyxgjagfr[/url], [link=http://nzoohfgasgwt.com/]nzoohfgasgwt[/link], http://ebxxblssqzhl.com/