nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to rails 3.2.6

Browse source
This commit is contained in:
Jonne Haß 2012-09-06 20:35:18 +02:00
parent 9f27eba174
commit 6780d83770
2 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -3,7 +3,7 @@ source 'http://rubygems.org'
gem 'bundler', '> 1.1.0' gem 'bundler', '> 1.1.0'
ruby '1.9.3' if ENV['HEROKU'] ruby '1.9.3' if ENV['HEROKU']
gem 'rails', '3.2.6' gem 'rails', '3.2.8'
gem 'foreman', '0.46' gem 'foreman', '0.46'

56
Gemfile.lock
View file

@ -59,34 +59,34 @@ GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
SystemTimer (1.2.3) SystemTimer (1.2.3)
actionmailer (3.2.6) actionmailer (3.2.8)
actionpack (= 3.2.6) actionpack (= 3.2.8)
mail (~> 2.4.4) mail (~> 2.4.4)
actionpack (3.2.6) actionpack (3.2.8)
activemodel (= 3.2.6) activemodel (= 3.2.8)
activesupport (= 3.2.6) activesupport (= 3.2.8)
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.2) rack-cache (~> 1.2)
rack-test (~> 0.6.1) rack-test (~> 0.6.1)
sprockets (~> 2.1.3) sprockets (~> 2.1.3)
activemodel (3.2.6) activemodel (3.2.8)
activesupport (= 3.2.6) activesupport (= 3.2.8)
builder (~> 3.0.0) builder (~> 3.0.0)
activerecord (3.2.6) activerecord (3.2.8)
activemodel (= 3.2.6) activemodel (= 3.2.8)
activesupport (= 3.2.6) activesupport (= 3.2.8)
arel (~> 3.0.2) arel (~> 3.0.2)
tzinfo (~> 0.3.29) tzinfo (~> 0.3.29)
activerecord-import (0.2.9) activerecord-import (0.2.9)
activerecord (~> 3.0) activerecord (~> 3.0)
activerecord (~> 3.0) activerecord (~> 3.0)
activeresource (3.2.6) activeresource (3.2.8)
activemodel (= 3.2.6) activemodel (= 3.2.8)
activesupport (= 3.2.6) activesupport (= 3.2.8)
activesupport (3.2.6) activesupport (3.2.8)
i18n (~> 0.6) i18n (~> 0.6)
multi_json (~> 1.0) multi_json (~> 1.0)
acts_as_api (0.4) acts_as_api (0.4)
@ -253,7 +253,7 @@ GEM
jquery-ui-rails (0.2.2) jquery-ui-rails (0.2.2)
jquery-rails jquery-rails
railties (>= 3.1.0) railties (>= 3.1.0)
json (1.7.3) json (1.7.5)
kaminari (0.13.0) kaminari (0.13.0)
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
@ -339,21 +339,21 @@ GEM
rack rack
rack-test (0.6.1) rack-test (0.6.1)
rack (>= 1.0) rack (>= 1.0)
rails (3.2.6) rails (3.2.8)
actionmailer (= 3.2.6) actionmailer (= 3.2.8)
actionpack (= 3.2.6) actionpack (= 3.2.8)
activerecord (= 3.2.6) activerecord (= 3.2.8)
activeresource (= 3.2.6) activeresource (= 3.2.8)
activesupport (= 3.2.6) activesupport (= 3.2.8)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.2.6) railties (= 3.2.8)
rails-i18n (0.6.5) rails-i18n (0.6.5)
i18n (~> 0.5) i18n (~> 0.5)
rails_autolink (1.0.9) rails_autolink (1.0.9)
rails (~> 3.1) rails (~> 3.1)
railties (3.2.6) railties (3.2.8)
actionpack (= 3.2.6) actionpack (= 3.2.8)
activesupport (= 3.2.6) activesupport (= 3.2.8)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
@ -434,7 +434,7 @@ GEM
daemons (>= 1.0.9) daemons (>= 1.0.9)
eventmachine (>= 0.12.6) eventmachine (>= 0.12.6)
rack (>= 1.0.0) rack (>= 1.0.0)
thor (0.15.3) thor (0.16.0)
tilt (1.3.3) tilt (1.3.3)
timecop (0.3.5) timecop (0.3.5)
treetop (1.4.10) treetop (1.4.10)
@ -531,7 +531,7 @@ DEPENDENCIES
rack-piwik rack-piwik
rack-rewrite (~> 1.2.1) rack-rewrite (~> 1.2.1)
rack-ssl rack-ssl
rails (= 3.2.6) rails (= 3.2.8)
rails-i18n rails-i18n
rails_admin! rails_admin!
rails_autolink rails_autolink