Permalink
Browse files

Merge pull request #1 from andrew/master

Updated rails to 3.0.9 and split to 0.2.2
  • Loading branch information...
2 parents ffa3402 + e204555 commit 985d65813871c9c2ea613bfee22c883ef9be9745 @semanticart committed Jun 19, 2011
Showing with 41 additions and 39 deletions.
  1. +2 −2 Gemfile
  2. +39 −37 Gemfile.lock
View
@@ -1,7 +1,7 @@
source 'http://rubygems.org'
-gem 'rails', '3.0.7'
+gem 'rails', '~> 3.0.9'
gem 'sqlite3'
-gem 'split'
+gem 'split', '~> 0.2.2'
View
@@ -2,33 +2,33 @@ GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
- actionmailer (3.0.7)
- actionpack (= 3.0.7)
- mail (~> 2.2.15)
- actionpack (3.0.7)
- activemodel (= 3.0.7)
- activesupport (= 3.0.7)
+ actionmailer (3.0.9)
+ actionpack (= 3.0.9)
+ mail (~> 2.2.19)
+ actionpack (3.0.9)
+ activemodel (= 3.0.9)
+ activesupport (= 3.0.9)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.5.0)
rack (~> 1.2.1)
rack-mount (~> 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
- activemodel (3.0.7)
- activesupport (= 3.0.7)
+ activemodel (3.0.9)
+ activesupport (= 3.0.9)
builder (~> 2.1.2)
i18n (~> 0.5.0)
- activerecord (3.0.7)
- activemodel (= 3.0.7)
- activesupport (= 3.0.7)
- arel (~> 2.0.2)
+ activerecord (3.0.9)
+ activemodel (= 3.0.9)
+ activesupport (= 3.0.9)
+ arel (~> 2.0.10)
tzinfo (~> 0.3.23)
- activeresource (3.0.7)
- activemodel (= 3.0.7)
- activesupport (= 3.0.7)
- activesupport (3.0.7)
- arel (2.0.9)
+ activeresource (3.0.9)
+ activemodel (= 3.0.9)
+ activesupport (= 3.0.9)
+ activesupport (3.0.9)
+ arel (2.0.10)
builder (2.1.2)
erubis (2.6.6)
abstract (>= 1.0.0)
@@ -40,46 +40,48 @@ GEM
treetop (~> 1.4.8)
mime-types (1.16)
polyglot (0.3.1)
- rack (1.2.2)
+ rack (1.2.3)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
rack (>= 1.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)
+ rails (3.0.9)
+ actionmailer (= 3.0.9)
+ actionpack (= 3.0.9)
+ activerecord (= 3.0.9)
+ activeresource (= 3.0.9)
+ activesupport (= 3.0.9)
bundler (~> 1.0)
- railties (= 3.0.7)
- railties (3.0.7)
- actionpack (= 3.0.7)
- activesupport (= 3.0.7)
+ railties (= 3.0.9)
+ railties (3.0.9)
+ actionpack (= 3.0.9)
+ activesupport (= 3.0.9)
rake (>= 0.8.7)
+ rdoc (~> 3.4)
thor (~> 0.14.4)
- rake (0.8.7)
- redis (2.2.0)
- redis-namespace (0.10.0)
+ rake (0.9.2)
+ rdoc (3.6.1)
+ redis (2.2.1)
+ redis-namespace (1.0.3)
redis (< 3.0.0)
sinatra (1.2.6)
rack (~> 1.1)
- tilt (< 2.0, >= 1.2.2)
- split (0.2.1)
+ tilt (>= 1.2.2, < 2.0)
+ split (0.2.2)
redis (~> 2.1)
- redis-namespace (~> 0.10.0)
+ redis-namespace (~> 1.0.3)
sinatra (~> 1.2.6)
sqlite3 (1.3.3)
thor (0.14.6)
tilt (1.3.2)
treetop (1.4.9)
polyglot (>= 0.3.1)
- tzinfo (0.3.27)
+ tzinfo (0.3.28)
PLATFORMS
ruby
DEPENDENCIES
- rails (= 3.0.7)
- split
+ rails (~> 3.0.9)
+ split (~> 0.2.2)
sqlite3

0 comments on commit 985d658

Please sign in to comment.