Skip to content
This repository has been archived by the owner on Aug 1, 2022. It is now read-only.

Update rails up to 3.2.11 #41

Merged
merged 1 commit into from Jan 11, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org' source 'http://rubygems.org'


gem 'rails', '3.2.2' gem 'rails', '3.2.11'
gem 'mysql2' gem 'mysql2'
gem 'sqlite3' gem 'sqlite3'


Expand Down
85 changes: 43 additions & 42 deletions Gemfile.lock
@@ -1,31 +1,31 @@
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
actionmailer (3.2.2) actionmailer (3.2.11)
actionpack (= 3.2.2) actionpack (= 3.2.11)
mail (~> 2.4.0) mail (~> 2.4.4)
actionpack (3.2.2) actionpack (3.2.11)
activemodel (= 3.2.2) activemodel (= 3.2.11)
activesupport (= 3.2.2) activesupport (= 3.2.11)
builder (~> 3.0.0) builder (~> 3.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
journey (~> 1.0.1) journey (~> 1.0.4)
rack (~> 1.4.0) rack (~> 1.4.0)
rack-cache (~> 1.1) rack-cache (~> 1.2)
rack-test (~> 0.6.1) rack-test (~> 0.6.1)
sprockets (~> 2.1.2) sprockets (~> 2.2.1)
activemodel (3.2.2) activemodel (3.2.11)
activesupport (= 3.2.2) activesupport (= 3.2.11)
builder (~> 3.0.0) builder (~> 3.0.0)
activerecord (3.2.2) activerecord (3.2.11)
activemodel (= 3.2.2) activemodel (= 3.2.11)
activesupport (= 3.2.2) activesupport (= 3.2.11)
arel (~> 3.0.2) arel (~> 3.0.2)
tzinfo (~> 0.3.29) tzinfo (~> 0.3.29)
activeresource (3.2.2) activeresource (3.2.11)
activemodel (= 3.2.2) activemodel (= 3.2.11)
activesupport (= 3.2.2) activesupport (= 3.2.11)
activesupport (3.2.2) activesupport (3.2.11)
i18n (~> 0.6) i18n (~> 0.6)
multi_json (~> 1.0) multi_json (~> 1.0)
addressable (2.2.7) addressable (2.2.7)
Expand All @@ -34,7 +34,7 @@ GEM
builder builder
ansible (0.2.0) ansible (0.2.0)
arel (3.0.2) arel (3.0.2)
builder (3.0.0) builder (3.0.4)
capistrano (2.13.5) capistrano (2.13.5)
highline highline
net-scp (>= 1.0.0) net-scp (>= 1.0.0)
Expand Down Expand Up @@ -98,15 +98,15 @@ GEM
hashie (1.2.0) hashie (1.2.0)
highline (1.6.15) highline (1.6.15)
hike (1.2.1) hike (1.2.1)
i18n (0.6.0) i18n (0.6.1)
inherited_resources (1.3.1) inherited_resources (1.3.1)
has_scope (~> 0.5.0) has_scope (~> 0.5.0)
responders (~> 0.6) responders (~> 0.6)
journey (1.0.3) journey (1.0.4)
jquery-rails (2.0.2) jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0) railties (>= 3.2.0, < 5.0)
thor (~> 0.14) thor (~> 0.14)
json (1.6.6) json (1.7.6)
kaminari (0.13.0) kaminari (0.13.0)
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
Expand All @@ -123,8 +123,8 @@ GEM
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
marked (1.2.2) marked (1.2.2)
mime-types (1.18) mime-types (1.19)
multi_json (1.2.0) multi_json (1.5.0)
multipart-post (1.1.5) multipart-post (1.1.5)
mysql2 (0.3.11) mysql2 (0.3.11)
net-scp (1.0.4) net-scp (1.0.4)
Expand All @@ -151,31 +151,31 @@ GEM
permanent_records (2.1.2) permanent_records (2.1.2)
activerecord activerecord
polyglot (0.3.3) polyglot (0.3.3)
rack (1.4.1) rack (1.4.3)
rack-cache (1.2) rack-cache (1.2)
rack (>= 0.4) rack (>= 0.4)
rack-protection (1.2.0) rack-protection (1.2.0)
rack rack
rack-ssl (1.3.2) rack-ssl (1.3.2)
rack rack
rack-test (0.6.1) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (3.2.2) rails (3.2.11)
actionmailer (= 3.2.2) actionmailer (= 3.2.11)
actionpack (= 3.2.2) actionpack (= 3.2.11)
activerecord (= 3.2.2) activerecord (= 3.2.11)
activeresource (= 3.2.2) activeresource (= 3.2.11)
activesupport (= 3.2.2) activesupport (= 3.2.11)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.2.2) railties (= 3.2.11)
railties (3.2.2) railties (3.2.11)
actionpack (= 3.2.2) actionpack (= 3.2.11)
activesupport (= 3.2.2) activesupport (= 3.2.11)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
thor (~> 0.14.6) thor (>= 0.14.6, < 2.0)
rake (0.9.2.2) rake (10.0.3)
rdoc (3.12) rdoc (3.12)
json (~> 1.4) json (~> 1.4)
redis (2.2.2) redis (2.2.2)
Expand Down Expand Up @@ -218,8 +218,9 @@ GEM
slim (1.2.0) slim (1.2.0)
temple (~> 0.4.0) temple (~> 0.4.0)
tilt (~> 1.3.3) tilt (~> 1.3.3)
sprockets (2.1.2) sprockets (2.2.2)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.5) sqlite3 (1.3.5)
Expand All @@ -228,14 +229,14 @@ GEM
libv8 (~> 3.3.10) libv8 (~> 3.3.10)
thor (0.14.6) thor (0.14.6)
tilt (1.3.3) tilt (1.3.3)
treetop (1.4.10) treetop (1.4.12)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
twitter-bootstrap-rails (2.0.5) twitter-bootstrap-rails (2.0.5)
actionpack (>= 3.1) actionpack (>= 3.1)
less-rails (~> 2.2.0) less-rails (~> 2.2.0)
railties (>= 3.1) railties (>= 3.1)
tzinfo (0.3.32) tzinfo (0.3.35)
uglifier (1.2.4) uglifier (1.2.4)
execjs (>= 0.3.0) execjs (>= 0.3.0)
multi_json (>= 1.0.2) multi_json (>= 1.0.2)
Expand Down Expand Up @@ -281,7 +282,7 @@ DEPENDENCIES
omniauth-github omniauth-github
open4 open4
permanent_records permanent_records
rails (= 3.2.2) rails (= 3.2.11)
rspec-rails rspec-rails
sass-rails (~> 3.2.3) sass-rails (~> 3.2.3)
shoulda-matchers shoulda-matchers
Expand Down