This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Update to Rails 3.0.7.

  • Loading branch information...
eventualbuddha committed Jun 15, 2011
1 parent 7f37b6b commit a7802ded61711acdbc7ff985084480979165dc31
Showing with 47 additions and 47 deletions.
  1. +1 −1 Gemfile
  2. +45 −45 Gemfile.lock
  3. +1 −1 lib/data_preloading.rb
View
@@ -1,7 +1,7 @@
source :gemcutter
# Regular gems
-gem 'rails', '3.0.1'
+gem 'rails', '3.0.7'
gem 'resque', '1.10.0'
gem 'system_timer'
gem 'daemon_controller', '0.2.5'
View
@@ -2,35 +2,34 @@ GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
- actionmailer (3.0.1)
- actionpack (= 3.0.1)
- mail (~> 2.2.5)
- actionpack (3.0.1)
- activemodel (= 3.0.1)
- activesupport (= 3.0.1)
+ actionmailer (3.0.7)
+ actionpack (= 3.0.7)
+ mail (~> 2.2.15)
+ actionpack (3.0.7)
+ activemodel (= 3.0.7)
+ activesupport (= 3.0.7)
builder (~> 2.1.2)
erubis (~> 2.6.6)
- i18n (~> 0.4.1)
+ i18n (~> 0.5.0)
rack (~> 1.2.1)
- rack-mount (~> 0.6.12)
- rack-test (~> 0.5.4)
+ rack-mount (~> 0.6.14)
+ rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
- activemodel (3.0.1)
- activesupport (= 3.0.1)
+ activemodel (3.0.7)
+ activesupport (= 3.0.7)
builder (~> 2.1.2)
- i18n (~> 0.4.1)
- activerecord (3.0.1)
- activemodel (= 3.0.1)
- activesupport (= 3.0.1)
- arel (~> 1.0.0)
+ i18n (~> 0.5.0)
+ activerecord (3.0.7)
+ activemodel (= 3.0.7)
+ activesupport (= 3.0.7)
+ arel (~> 2.0.2)
tzinfo (~> 0.3.23)
- activeresource (3.0.1)
- activemodel (= 3.0.1)
- activesupport (= 3.0.1)
- activesupport (3.0.1)
+ activeresource (3.0.7)
+ activemodel (= 3.0.7)
+ activesupport (= 3.0.7)
+ activesupport (3.0.7)
addressable (2.2.0)
- arel (1.0.1)
- activesupport (~> 3.0.0)
+ arel (2.0.10)
builder (2.1.2)
chronic (0.2.3)
hoe (>= 1.2.1)
@@ -46,40 +45,41 @@ GEM
hoe (2.6.1)
rake (>= 0.8.7)
rubyforge (>= 2.0.4)
- i18n (0.4.1)
+ i18n (0.5.0)
iconv (0.1)
json (1.4.6)
json_pure (1.4.6)
libxml-ruby (1.1.3)
linecache (0.43)
machinist (1.0.6)
- mail (2.2.7)
+ mail (2.2.19)
activesupport (>= 2.3.6)
- mime-types
- treetop (>= 1.4.5)
+ i18n (>= 0.4.0)
+ mime-types (~> 1.16)
+ treetop (~> 1.4.8)
memcache-client (1.8.5)
mime-types (1.16)
mysql (2.8.1)
oniguruma (1.1.0)
polyglot (0.3.1)
rack (1.2.1)
- rack-mount (0.6.13)
+ rack-mount (0.6.14)
rack (>= 1.0.0)
- rack-test (0.5.4)
+ rack-test (0.5.7)
rack (>= 1.0)
- rails (3.0.1)
- actionmailer (= 3.0.1)
- actionpack (= 3.0.1)
- activerecord (= 3.0.1)
- activeresource (= 3.0.1)
- activesupport (= 3.0.1)
- bundler (~> 1.0.0)
- railties (= 3.0.1)
- railties (3.0.1)
- actionpack (= 3.0.1)
- activesupport (= 3.0.1)
- rake (>= 0.8.4)
- thor (~> 0.14.0)
+ rails (3.0.7)
+ actionmailer (= 3.0.7)
+ actionpack (= 3.0.7)
+ activerecord (= 3.0.7)
+ activeresource (= 3.0.7)
+ activesupport (= 3.0.7)
+ bundler (~> 1.0)
+ railties (= 3.0.7)
+ railties (3.0.7)
+ actionpack (= 3.0.7)
+ activesupport (= 3.0.7)
+ rake (>= 0.8.7)
+ thor (~> 0.14.4)
rake (0.8.7)
rchardet (1.3)
rdoc (2.5.9)
@@ -117,11 +117,11 @@ GEM
rack (~> 1.1)
tilt (~> 1.1)
system_timer (1.0)
- thor (0.14.0)
+ thor (0.14.6)
tilt (1.1)
- treetop (1.4.8)
+ treetop (1.4.9)
polyglot (>= 0.3.1)
- tzinfo (0.3.23)
+ tzinfo (0.3.27)
unicorn (1.1.2)
rack
vegas (0.1.8)
@@ -147,7 +147,7 @@ DEPENDENCIES
mime-types
mysql
oniguruma
- rails (= 3.0.1)
+ rails (= 3.0.7)
rchardet
rdoc
resque (= 1.10.0)
View
@@ -31,7 +31,7 @@ def _preload_url_into(url, setter)
def _preload_data(data, setter)
content_for :footer do
- <<-HTML
+ <<-HTML.html_safe
<script type="text/javascript">
wesabe.ready("#{setter}", function() {
#{setter}(#{ActiveSupport::JSON.encode(data)});

0 comments on commit a7802de

Please sign in to comment.