Permalink
Browse files

updated to rails 3.1.3

  • Loading branch information...
1 parent ca09be2 commit 65e22bf90ed4b41f1439a923f8ace363b72a6c19 @chrismatthieu committed Dec 5, 2011
Showing with 33 additions and 33 deletions.
  1. +1 −1 Gemfile
  2. +32 −32 Gemfile.lock
View
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '3.1.2'
+gem 'rails', '3.1.3'
gem 'omniauth', '~> 0.3.2'
gem 'twitter', '1.7.2'
View
@@ -3,33 +3,33 @@ GEM
specs:
XMLCanonicalizer (1.0.1)
log4r (>= 1.0.4)
- actionmailer (3.1.2)
- actionpack (= 3.1.2)
+ actionmailer (3.1.3)
+ actionpack (= 3.1.3)
mail (~> 2.3.0)
- actionpack (3.1.2)
- activemodel (= 3.1.2)
- activesupport (= 3.1.2)
+ actionpack (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
rack (~> 1.3.5)
rack-cache (~> 1.1)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.0)
- activemodel (3.1.2)
- activesupport (= 3.1.2)
+ sprockets (~> 2.0.3)
+ activemodel (3.1.3)
+ activesupport (= 3.1.3)
builder (~> 3.0.0)
i18n (~> 0.6)
- activerecord (3.1.2)
- activemodel (= 3.1.2)
- activesupport (= 3.1.2)
+ activerecord (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
arel (~> 2.2.1)
tzinfo (~> 0.3.29)
- activeresource (3.1.2)
- activemodel (= 3.1.2)
- activesupport (= 3.1.2)
- activesupport (3.1.2)
+ activeresource (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
+ activesupport (3.1.3)
multi_json (~> 1.0)
addressable (2.2.6)
ansi (1.4.1)
@@ -56,10 +56,10 @@ GEM
hashie (1.1.0)
hike (1.2.1)
i18n (0.6.0)
- jquery-rails (1.0.18)
+ jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
- json (1.6.1)
+ json (1.6.3)
log4r (1.1.9)
macaddr (1.5.0)
systemu (>= 2.4.0)
@@ -68,9 +68,9 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
- multi_json (1.0.3)
+ multi_json (1.0.4)
multi_xml (0.4.1)
- multipart-post (1.1.3)
+ multipart-post (1.1.4)
mysql2 (0.3.10)
net-ldap (0.2.2)
nokogiri (1.5.0)
@@ -128,17 +128,17 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.2)
- actionmailer (= 3.1.2)
- actionpack (= 3.1.2)
- activerecord (= 3.1.2)
- activeresource (= 3.1.2)
- activesupport (= 3.1.2)
+ rails (3.1.3)
+ actionmailer (= 3.1.3)
+ actionpack (= 3.1.3)
+ activerecord (= 3.1.3)
+ activeresource (= 3.1.3)
+ activesupport (= 3.1.3)
bundler (~> 1.0)
- railties (= 3.1.2)
- railties (3.1.2)
- actionpack (= 3.1.2)
- activesupport (= 3.1.2)
+ railties (= 3.1.3)
+ railties (3.1.3)
+ actionpack (= 3.1.3)
+ activesupport (= 3.1.3)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -152,14 +152,14 @@ GEM
ruby-openid-apps-discovery (1.2.0)
ruby-openid (>= 2.1.7)
rubyntlm (0.1.1)
- sass (3.1.10)
+ sass (3.1.11)
sass-rails (3.1.5)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
sass (~> 3.1.10)
tilt (~> 1.3.2)
simple_oauth (0.1.5)
- sprockets (2.1.2)
+ sprockets (2.0.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (!= 1.3.0, ~> 1.1)
@@ -197,7 +197,7 @@ DEPENDENCIES
mysql2
omniauth (~> 0.3.2)
pg
- rails (= 3.1.2)
+ rails (= 3.1.3)
sass-rails (~> 3.1.2)
turn
twitter (= 1.7.2)

0 comments on commit 65e22bf

Please sign in to comment.