Browse files

Merge pull request #13 from BanzaiMan/master

Bug 892431
  • Loading branch information...
2 parents f9abbb1 + 523b273 commit 8802078fd979057fb6ec8578f3d197541b6541ab @BanzaiMan BanzaiMan committed Jan 17, 2013
Showing with 33 additions and 33 deletions.
  1. +2 −2 Gemfile
  2. +31 −31 Gemfile.lock
View
4 Gemfile
@@ -1,6 +1,6 @@
-source 'http://mirror1.prod.rhcloud.com/mirror/ruby/'
+source 'http://rubygems.org'
-gem 'rails', '3.2.10'
+gem 'rails', '3.2.11'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
View
62 Gemfile.lock
@@ -1,31 +1,31 @@
GEM
- remote: http://mirror1.prod.rhcloud.com/mirror/ruby/
+ remote: http://rubygems.org/
specs:
- actionmailer (3.2.10)
- actionpack (= 3.2.10)
+ actionmailer (3.2.11)
+ actionpack (= 3.2.11)
mail (~> 2.4.4)
- actionpack (3.2.10)
- activemodel (= 3.2.10)
- activesupport (= 3.2.10)
+ actionpack (3.2.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.10)
- activesupport (= 3.2.10)
+ activemodel (3.2.11)
+ activesupport (= 3.2.11)
builder (~> 3.0.0)
- activerecord (3.2.10)
- activemodel (= 3.2.10)
- activesupport (= 3.2.10)
+ activerecord (3.2.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.10)
- activemodel (= 3.2.10)
- activesupport (= 3.2.10)
- activesupport (3.2.10)
+ activeresource (3.2.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
+ activesupport (3.2.11)
i18n (~> 0.6)
multi_json (~> 1.0)
arel (3.0.2)
@@ -52,37 +52,37 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
- minitest (4.3.3)
+ minitest (4.4.0)
multi_json (1.5.0)
mysql2 (0.3.11)
polyglot (0.3.3)
- rack (1.4.1)
+ rack (1.4.4)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.10)
- actionmailer (= 3.2.10)
- actionpack (= 3.2.10)
- activerecord (= 3.2.10)
- activeresource (= 3.2.10)
- activesupport (= 3.2.10)
+ rails (3.2.11)
+ actionmailer (= 3.2.11)
+ actionpack (= 3.2.11)
+ activerecord (= 3.2.11)
+ activeresource (= 3.2.11)
+ activesupport (= 3.2.11)
bundler (~> 1.0)
- railties (= 3.2.10)
- railties (3.2.10)
- actionpack (= 3.2.10)
- activesupport (= 3.2.10)
+ railties (= 3.2.11)
+ railties (3.2.11)
+ actionpack (= 3.2.11)
+ activesupport (= 3.2.11)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.3)
rdoc (3.12)
json (~> 1.4)
- sass (3.2.4)
- sass-rails (3.2.5)
+ sass (3.2.5)
+ sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
@@ -91,7 +91,7 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.6)
+ sqlite3 (1.3.7)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.12)
@@ -110,7 +110,7 @@ DEPENDENCIES
jquery-rails
minitest
mysql2
- rails (= 3.2.10)
+ rails (= 3.2.11)
sass-rails (~> 3.2.3)
sqlite3
thor (= 0.14.6)

0 comments on commit 8802078

Please sign in to comment.