Permalink
Browse files

Update gems, tables, adding gems to vendor/cache

  • Loading branch information...
annacruz committed Aug 27, 2012
1 parent 6ad4854 commit 35159f03cd5e01726e9d9f6cb741b7330dae8f1f
Showing with 516 additions and 197 deletions.
  1. +1 −0 .gitignore
  2. +18 −18 Gemfile
  3. +118 −119 Gemfile.lock
  4. +84 −40 config/initializers/devise.rb
  5. +188 −0 config/initializers/devise.rb.old
  6. +15 −5 config/locales/devise.en.yml
  7. +48 −0 config/locales/devise.en.yml.old
  8. +44 −15 db/migrate/20110402180017_devise_create_users.rb
  9. BIN vendor/cache/RedCloth-4.2.9.gem
  10. BIN vendor/cache/actionmailer-3.2.8.gem
  11. BIN vendor/cache/actionpack-3.2.8.gem
  12. BIN vendor/cache/activemodel-3.2.8.gem
  13. BIN vendor/cache/activerecord-3.2.8.gem
  14. BIN vendor/cache/activeresource-3.2.8.gem
  15. BIN vendor/cache/activesupport-3.2.8.gem
  16. BIN vendor/cache/addressable-2.3.2.gem
  17. BIN vendor/cache/ansi-1.4.3.gem
  18. BIN vendor/cache/arel-3.0.2.gem
  19. BIN vendor/cache/bcrypt-ruby-3.0.1.gem
  20. BIN vendor/cache/builder-3.0.0.gem
  21. BIN vendor/cache/coffee-script-2.2.0.gem
  22. BIN vendor/cache/coffee-script-source-1.3.3.gem
  23. BIN vendor/cache/devise-2.1.2.gem
  24. BIN vendor/cache/diff-lcs-1.1.3.gem
  25. BIN vendor/cache/dragonfly-0.9.12.gem
  26. BIN vendor/cache/erubis-2.7.0.gem
  27. BIN vendor/cache/execjs-1.4.0.gem
  28. BIN vendor/cache/factory_girl-4.0.0.gem
  29. BIN vendor/cache/factory_girl_rails-4.0.0.gem
  30. BIN vendor/cache/hike-1.2.1.gem
  31. BIN vendor/cache/i18n-0.6.0.gem
  32. BIN vendor/cache/journey-1.0.4.gem
  33. BIN vendor/cache/jquery-rails-2.1.1.gem
  34. BIN vendor/cache/json-1.7.5.gem
  35. BIN vendor/cache/launchy-2.1.2.gem
  36. BIN vendor/cache/libv8-3.3.10.4.gem
  37. BIN vendor/cache/mail-2.4.4.gem
  38. BIN vendor/cache/mime-types-1.19.gem
  39. BIN vendor/cache/multi_json-1.3.6.gem
  40. BIN vendor/cache/mysql2-0.3.11.gem
  41. BIN vendor/cache/orm_adapter-0.4.0.gem
  42. BIN vendor/cache/polyglot-0.3.3.gem
  43. BIN vendor/cache/rack-1.4.1.gem
  44. BIN vendor/cache/rack-cache-1.2.gem
  45. BIN vendor/cache/rack-protection-1.2.0.gem
  46. BIN vendor/cache/rack-ssl-1.3.2.gem
  47. BIN vendor/cache/rack-test-0.6.1.gem
  48. BIN vendor/cache/rails-3.2.8.gem
  49. BIN vendor/cache/railties-3.2.8.gem
  50. BIN vendor/cache/rake-0.9.2.2.gem
  51. BIN vendor/cache/rdoc-3.12.gem
  52. BIN vendor/cache/redis-3.0.1.gem
  53. BIN vendor/cache/redis-namespace-1.2.1.gem
  54. BIN vendor/cache/resque-1.22.0.gem
  55. BIN vendor/cache/resque_mailer-2.1.0.gem
  56. BIN vendor/cache/rspec-2.11.0.gem
  57. BIN vendor/cache/rspec-core-2.11.1.gem
  58. BIN vendor/cache/rspec-expectations-2.11.2.gem
  59. BIN vendor/cache/rspec-mocks-2.11.2.gem
  60. BIN vendor/cache/rspec-rails-2.11.0.gem
  61. BIN vendor/cache/sass-3.2.1.gem
  62. BIN vendor/cache/sass-rails-3.2.5.gem
  63. BIN vendor/cache/shoulda-matchers-1.2.0.gem
  64. BIN vendor/cache/simple_form-2.0.2.gem
  65. BIN vendor/cache/simplecov-0.6.4.gem
  66. BIN vendor/cache/simplecov-html-0.5.3.gem
  67. BIN vendor/cache/sinatra-1.3.3.gem
  68. BIN vendor/cache/sprockets-2.1.3.gem
  69. BIN vendor/cache/therubyracer-0.10.2.gem
  70. BIN vendor/cache/thor-0.16.0.gem
  71. BIN vendor/cache/tilt-1.3.3.gem
  72. BIN vendor/cache/treetop-1.4.10.gem
  73. BIN vendor/cache/turn-0.9.6.gem
  74. BIN vendor/cache/tzinfo-0.3.33.gem
  75. BIN vendor/cache/uglifier-1.2.7.gem
  76. BIN vendor/cache/vegas-0.1.11.gem
  77. BIN vendor/cache/warden-1.2.1.gem
View
@@ -14,3 +14,4 @@ Gemfile.lock
config/initializers/setup_mail.rb
public/system/dragonfly/*
.rspec
+*.yml
View
36 Gemfile
@@ -1,29 +1,29 @@
source :rubygems
-gem 'rails', '3.1.2'
-gem 'sass-rails', '3.1.5'
-gem 'jquery-rails', '1.0.18'
-gem 'coffee-script', '2.2.0'
-gem 'devise', '1.4.7'
-gem 'mysql2', '0.3.7'
-gem 'uglifier', '1.0.3'
-gem 'RedCloth', '4.2.9'
-gem 'simple_form', '1.5.2'
-gem 'dragonfly', '0.9.5'
+gem 'rails', '~> 3.2.8'
+gem 'sass-rails', '~> 3.2.5'
+gem 'jquery-rails', '~> 2.1.1'
+gem 'coffee-script', '~> 2.2.0'
+gem 'devise', '~> 2.1.2'
+gem 'mysql2', '~> 0.3.11'
+gem 'uglifier', '~> 1.2.7'
+gem 'RedCloth', '~> 4.2.9'
+gem 'simple_form', '~> 2.0.2'
+gem 'dragonfly', '~> 0.9.12'
# Resque gems
-gem "resque",'1.19.0'
-gem 'resque_mailer'
+gem 'resque', '~> 1.22.0'
+gem 'resque_mailer', '~> 2.1.0'
group :development,:test do
gem 'turn', :require => false
- gem 'rspec-rails', '2.8.0'
- gem 'shoulda-matchers', '1.0.0'
- gem 'factory_girl_rails', '1.1.0'
- gem 'launchy', '2.0.5'
- gem "simplecov", '0.5.3'
+ gem 'rspec-rails', '~> 2.11.0'
+ gem 'shoulda-matchers', '~> 1.2.0'
+ gem 'factory_girl_rails', '~> 4.0.0'
+ gem 'launchy', '~> 2.1.2'
+ gem 'simplecov', '~> 0.6.4'
end
group :production do
- gem 'therubyracer', '0.9.8'
+ gem 'therubyracer', '~> 0.10.2'
end
View
@@ -2,188 +2,187 @@ GEM
remote: http://rubygems.org/
specs:
RedCloth (4.2.9)
- actionmailer (3.1.2)
- actionpack (= 3.1.2)
- mail (~> 2.3.0)
- actionpack (3.1.2)
- activemodel (= 3.1.2)
- activesupport (= 3.1.2)
+ actionmailer (3.2.8)
+ actionpack (= 3.2.8)
+ mail (~> 2.4.4)
+ actionpack (3.2.8)
+ activemodel (= 3.2.8)
+ activesupport (= 3.2.8)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.5)
- rack-cache (~> 1.1)
- rack-mount (~> 0.8.2)
+ journey (~> 1.0.4)
+ rack (~> 1.4.0)
+ rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.0)
- activemodel (3.1.2)
- activesupport (= 3.1.2)
+ sprockets (~> 2.1.3)
+ activemodel (3.2.8)
+ activesupport (= 3.2.8)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.2)
- activemodel (= 3.1.2)
- activesupport (= 3.1.2)
- arel (~> 2.2.1)
+ activerecord (3.2.8)
+ activemodel (= 3.2.8)
+ activesupport (= 3.2.8)
+ arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.1.2)
- activemodel (= 3.1.2)
- activesupport (= 3.1.2)
- activesupport (3.1.2)
+ activeresource (3.2.8)
+ activemodel (= 3.2.8)
+ activesupport (= 3.2.8)
+ activesupport (3.2.8)
+ i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.2.6)
- ansi (1.4.1)
- arel (2.2.1)
+ addressable (2.3.2)
+ ansi (1.4.3)
+ arel (3.0.2)
bcrypt-ruby (3.0.1)
builder (3.0.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.3)
- devise (1.4.7)
+ coffee-script-source (1.3.3)
+ devise (2.1.2)
bcrypt-ruby (~> 3.0)
- orm_adapter (~> 0.0.3)
- warden (~> 1.0.3)
+ orm_adapter (~> 0.1)
+ railties (~> 3.1)
+ warden (~> 1.2.1)
diff-lcs (1.1.3)
- dragonfly (0.9.5)
+ dragonfly (0.9.12)
rack
erubis (2.7.0)
- execjs (1.2.9)
+ execjs (1.4.0)
multi_json (~> 1.0)
- factory_girl (2.0.5)
- factory_girl_rails (1.1.0)
- factory_girl (~> 2.0.0)
+ factory_girl (4.0.0)
+ activesupport (>= 3.0.0)
+ factory_girl_rails (4.0.0)
+ factory_girl (~> 4.0.0)
railties (>= 3.0.0)
hike (1.2.1)
i18n (0.6.0)
- jquery-rails (1.0.18)
- railties (~> 3.0)
+ journey (1.0.4)
+ jquery-rails (2.1.1)
+ railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
- json (1.6.1)
- launchy (2.0.5)
- addressable (~> 2.2.6)
+ json (1.7.5)
+ launchy (2.1.2)
+ addressable (~> 2.3)
libv8 (3.3.10.4)
- mail (2.3.0)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.17.2)
- multi_json (1.0.3)
- mysql2 (0.3.7)
- orm_adapter (0.0.5)
+ mime-types (1.19)
+ multi_json (1.3.6)
+ mysql2 (0.3.11)
+ orm_adapter (0.4.0)
polyglot (0.3.3)
- rack (1.3.5)
- rack-cache (1.1)
+ rack (1.4.1)
+ rack-cache (1.2)
rack (>= 0.4)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
- rack-protection (1.1.4)
+ rack-protection (1.2.0)
rack
rack-ssl (1.3.2)
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.2.8)
+ actionmailer (= 3.2.8)
+ actionpack (= 3.2.8)
+ activerecord (= 3.2.8)
+ activeresource (= 3.2.8)
+ activesupport (= 3.2.8)
bundler (~> 1.0)
- railties (= 3.1.2)
- railties (3.1.2)
- actionpack (= 3.1.2)
- activesupport (= 3.1.2)
+ railties (= 3.2.8)
+ railties (3.2.8)
+ actionpack (= 3.2.8)
+ activesupport (= 3.2.8)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.6)
+ thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
- rdoc (3.11)
+ rdoc (3.12)
json (~> 1.4)
- redis (2.2.2)
- redis-namespace (1.0.3)
- redis (< 3.0.0)
- resque (1.19.0)
+ redis (3.0.1)
+ redis-namespace (1.2.1)
+ redis (~> 3.0.0)
+ resque (1.22.0)
multi_json (~> 1.0)
- redis-namespace (~> 1.0.2)
+ redis-namespace (~> 1.0)
sinatra (>= 0.9.2)
vegas (~> 0.1.2)
- resque_mailer (2.0.2)
- actionmailer (>= 3.0.0)
- diff-lcs (~> 1.1.2)
- resque (>= 1.2.3)
- rspec (2.8.0)
- rspec-core (~> 2.8.0)
- rspec-expectations (~> 2.8.0)
- rspec-mocks (~> 2.8.0)
- rspec-core (2.8.0)
- rspec-expectations (2.8.0)
- rspec-mocks (2.8.0)
- rspec-rails (2.8.0)
+ resque_mailer (2.1.0)
+ actionmailer (~> 3.0)
+ rspec (2.11.0)
+ rspec-core (~> 2.11.0)
+ rspec-expectations (~> 2.11.0)
+ rspec-mocks (~> 2.11.0)
+ rspec-core (2.11.1)
+ rspec-expectations (2.11.2)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.11.2)
+ rspec-rails (2.11.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec (~> 2.8.0)
- sass (3.1.10)
- sass-rails (3.1.5)
- actionpack (~> 3.1.0)
- railties (~> 3.1.0)
- sass (~> 3.1.10)
- tilt (~> 1.3.2)
- shoulda-matchers (1.0.0)
- simple_form (1.5.2)
+ rspec (~> 2.11.0)
+ sass (3.2.1)
+ sass-rails (3.2.5)
+ railties (~> 3.2.0)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
+ shoulda-matchers (1.2.0)
+ activesupport (>= 3.0.0)
+ simple_form (2.0.2)
actionpack (~> 3.0)
activemodel (~> 3.0)
- simplecov (0.5.3)
- multi_json (~> 1.0.3)
+ simplecov (0.6.4)
+ multi_json (~> 1.0)
simplecov-html (~> 0.5.3)
simplecov-html (0.5.3)
- sinatra (1.3.1)
- rack (~> 1.3, >= 1.3.4)
- rack-protection (~> 1.1, >= 1.1.2)
+ sinatra (1.3.3)
+ rack (~> 1.3, >= 1.3.6)
+ rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
- sprockets (2.1.2)
+ sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- therubyracer (0.9.8)
+ therubyracer (0.10.2)
libv8 (~> 3.3.10)
- thor (0.14.6)
+ thor (0.16.0)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- turn (0.8.3)
+ turn (0.9.6)
ansi
- tzinfo (0.3.31)
- uglifier (1.0.3)
+ tzinfo (0.3.33)
+ uglifier (1.2.7)
execjs (>= 0.3.0)
- multi_json (>= 1.0.2)
- vegas (0.1.8)
+ multi_json (~> 1.3)
+ vegas (0.1.11)
rack (>= 1.0.0)
- warden (1.0.6)
+ warden (1.2.1)
rack (>= 1.0)
PLATFORMS
ruby
DEPENDENCIES
- RedCloth (= 4.2.9)
- coffee-script (= 2.2.0)
- devise (= 1.4.7)
- dragonfly (= 0.9.5)
- factory_girl_rails (= 1.1.0)
- jquery-rails (= 1.0.18)
- launchy (= 2.0.5)
- mysql2 (= 0.3.7)
- rails (= 3.1.2)
- resque (= 1.19.0)
- resque_mailer
- rspec-rails (= 2.8.0)
- sass-rails (= 3.1.5)
- shoulda-matchers (= 1.0.0)
- simple_form (= 1.5.2)
- simplecov (= 0.5.3)
- therubyracer (= 0.9.8)
+ RedCloth (~> 4.2.9)
+ coffee-script (~> 2.2.0)
+ devise (~> 2.1.2)
+ dragonfly (~> 0.9.12)
+ factory_girl_rails (~> 4.0.0)
+ jquery-rails (~> 2.1.1)
+ launchy (~> 2.1.2)
+ mysql2 (~> 0.3.11)
+ rails (~> 3.2.8)
+ resque (~> 1.22.0)
+ resque_mailer (~> 2.1.0)
+ rspec-rails (~> 2.11.0)
+ sass-rails (~> 3.2.5)
+ shoulda-matchers (~> 1.2.0)
+ simple_form (~> 2.0.2)
+ simplecov (~> 0.6.4)
+ therubyracer (~> 0.10.2)
turn
- uglifier (= 1.0.3)
+ uglifier (~> 1.2.7)
Oops, something went wrong.

0 comments on commit 35159f0

Please sign in to comment.