Permalink
Browse files

Upgrade to Rails 3.1.3.

  • Loading branch information...
1 parent 8743236 commit bf59321c776f8a474a1d3e6c15a3667e708af99b @jimmycuadra jimmycuadra committed Dec 3, 2011
Showing with 569 additions and 753 deletions.
  1. +1 −5 .gitignore
  2. +31 −31 Gemfile
  3. +199 −108 Gemfile.lock
  4. +3 −6 Rakefile
  5. BIN {public → app/assets}/images/application/album_art.png
  6. BIN {public → app/assets}/images/application/apple-touch-icon.png
  7. BIN {public → app/assets}/images/application/checkbox/off.png
  8. BIN {public → app/assets}/images/application/checkbox/on.png
  9. BIN {public → app/assets}/images/application/checkbox/slider.png
  10. BIN {public → app/assets}/images/application/checkbox/slider_center.png
  11. BIN {public → app/assets}/images/application/checkbox/slider_left.png
  12. BIN {public → app/assets}/images/application/checkbox/slider_right.png
  13. BIN {public → app/assets}/images/application/episode_36.png
  14. BIN {public → app/assets}/images/application/favicon.png
  15. BIN {public → app/assets}/images/application/feed.png
  16. BIN {public → app/assets}/images/application/footer.gif
  17. BIN {public → app/assets}/images/application/header.png
  18. BIN {public → app/assets}/images/application/ical.gif
  19. BIN {public → app/assets}/images/application/itunes.png
  20. BIN {public → app/assets}/images/application/joyent.gif
  21. BIN {public → app/assets}/images/application/logo.png
  22. BIN {public → app/assets}/images/application/logo_podcast.jpg
  23. BIN {public → app/assets}/images/application/logo_podcast.png
  24. BIN {public → app/assets}/images/application/logo_podcast_big.png
  25. BIN {public → app/assets}/images/application/oreilly.gif
  26. BIN {public → app/assets}/images/application/peepcode.gif
  27. BIN {public → app/assets}/images/application/podcast.gif
  28. BIN {public → app/assets}/images/application/rubymine.gif
  29. BIN {public → app/assets}/images/application/selected_filter.gif
  30. BIN {public → app/assets}/images/application/social/aim_16.png
  31. BIN {public → app/assets}/images/application/social/aim_32.png
  32. BIN {public → app/assets}/images/application/social/apple_16.png
  33. BIN {public → app/assets}/images/application/social/apple_32.png
  34. BIN {public → app/assets}/images/application/social/bebo_16.png
  35. BIN {public → app/assets}/images/application/social/bebo_32.png
  36. BIN {public → app/assets}/images/application/social/blogger_16.png
  37. BIN {public → app/assets}/images/application/social/blogger_32.png
  38. BIN {public → app/assets}/images/application/social/brightkite_16.png
  39. BIN {public → app/assets}/images/application/social/brightkite_32.png
  40. BIN {public → app/assets}/images/application/social/delicious_16.png
  41. BIN {public → app/assets}/images/application/social/delicious_32.png
  42. BIN {public → app/assets}/images/application/social/designfloat_16.png
  43. BIN {public → app/assets}/images/application/social/designfloat_32.png
  44. BIN {public → app/assets}/images/application/social/digg_16.png
  45. BIN {public → app/assets}/images/application/social/digg_32.png
  46. BIN {public → app/assets}/images/application/social/digg_alt_16.png
  47. BIN {public → app/assets}/images/application/social/dopplr_16.png
  48. BIN {public → app/assets}/images/application/social/dopplr_32.png
  49. BIN {public → app/assets}/images/application/social/email_16.png
  50. BIN {public → app/assets}/images/application/social/email_32.png
  51. BIN {public → app/assets}/images/application/social/facebook_16.png
  52. BIN {public → app/assets}/images/application/social/facebook_32.png
  53. BIN {public → app/assets}/images/application/social/flickr_16.png
  54. BIN {public → app/assets}/images/application/social/flickr_32.png
  55. BIN {public → app/assets}/images/application/social/friendfeed_16.png
  56. BIN {public → app/assets}/images/application/social/friendfeed_32.png
  57. BIN {public → app/assets}/images/application/social/gamespot_16.png
  58. BIN {public → app/assets}/images/application/social/gamespot_32.png
  59. BIN {public → app/assets}/images/application/social/github_16.png
  60. BIN {public → app/assets}/images/application/social/github_32.png
  61. BIN {public → app/assets}/images/application/social/google_16.png
  62. BIN {public → app/assets}/images/application/social/google_32.png
  63. BIN {public → app/assets}/images/application/social/googletalk_16.png
  64. BIN {public → app/assets}/images/application/social/googletalk_32.png
  65. BIN {public → app/assets}/images/application/social/lastfm_16.png
  66. BIN {public → app/assets}/images/application/social/lastfm_32.png
  67. +4 −4 {public → app/assets}/images/application/social/license.txt
  68. BIN {public → app/assets}/images/application/social/linkedin_16.png
  69. BIN {public → app/assets}/images/application/social/linkedin_32.png
  70. BIN {public → app/assets}/images/application/social/mixx_16.png
  71. BIN {public → app/assets}/images/application/social/mixx_32.png
  72. BIN {public → app/assets}/images/application/social/mobileme_16.png
  73. BIN {public → app/assets}/images/application/social/mobileme_32.png
  74. BIN {public → app/assets}/images/application/social/myspace_16.png
  75. BIN {public → app/assets}/images/application/social/myspace_32.png
  76. BIN {public → app/assets}/images/application/social/netvibes_16.png
  77. BIN {public → app/assets}/images/application/social/netvibes_32.png
  78. BIN {public → app/assets}/images/application/social/newsvine_16.png
  79. BIN {public → app/assets}/images/application/social/newsvine_32.png
  80. BIN {public → app/assets}/images/application/social/openid_16.png
  81. BIN {public → app/assets}/images/application/social/openid_32.png
  82. BIN {public → app/assets}/images/application/social/picasa_16.png
  83. BIN {public → app/assets}/images/application/social/picasa_32.png
  84. BIN {public → app/assets}/images/application/social/plurk_16.png
  85. BIN {public → app/assets}/images/application/social/plurk_32.png
  86. BIN {public → app/assets}/images/application/social/posterous_16.png
  87. BIN {public → app/assets}/images/application/social/posterous_32.png
  88. BIN {public → app/assets}/images/application/social/rails_16.png
  89. BIN {public → app/assets}/images/application/social/rails_32.png
  90. BIN {public → app/assets}/images/application/social/reddit_16.png
  91. BIN {public → app/assets}/images/application/social/reddit_32.png
  92. BIN {public → app/assets}/images/application/social/rss_16.png
  93. BIN {public → app/assets}/images/application/social/rss_32.png
  94. BIN {public → app/assets}/images/application/social/ruby_16.png
  95. BIN {public → app/assets}/images/application/social/ruby_32.png
  96. BIN {public → app/assets}/images/application/social/skype_16.png
  97. BIN {public → app/assets}/images/application/social/skype_32.png
  98. BIN {public → app/assets}/images/application/social/stumbleupon_16.png
  99. BIN {public → app/assets}/images/application/social/stumbleupon_32.png
  100. BIN {public → app/assets}/images/application/social/technorati_16.png
  101. BIN {public → app/assets}/images/application/social/technorati_32.png
  102. BIN {public → app/assets}/images/application/social/tumblr_16.png
  103. BIN {public → app/assets}/images/application/social/tumblr_32.png
  104. BIN {public → app/assets}/images/application/social/twitter_16.png
  105. BIN {public → app/assets}/images/application/social/twitter_32.png
  106. BIN {public → app/assets}/images/application/social/viddler_16.png
  107. BIN {public → app/assets}/images/application/social/viddler_32.png
  108. BIN {public → app/assets}/images/application/social/vimeo_16.png
  109. BIN {public → app/assets}/images/application/social/vimeo_32.png
  110. BIN {public → app/assets}/images/application/social/virb_16.png
  111. BIN {public → app/assets}/images/application/social/virb_32.png
  112. BIN {public → app/assets}/images/application/social/web_16.png
  113. BIN {public → app/assets}/images/application/social/web_32.png
  114. BIN {public → app/assets}/images/application/social/windows_16.png
  115. BIN {public → app/assets}/images/application/social/windows_32.png
  116. BIN {public → app/assets}/images/application/social/wordpress_16.png
  117. BIN {public → app/assets}/images/application/social/wordpress_32.png
  118. BIN {public → app/assets}/images/application/social/yahoo_16.png
  119. BIN {public → app/assets}/images/application/social/yahoo_32.png
  120. BIN {public → app/assets}/images/application/social/yahoobuzz_16.png
  121. BIN {public → app/assets}/images/application/social/yahoobuzz_32.png
  122. BIN {public → app/assets}/images/application/social/yelp_16.png
  123. BIN {public → app/assets}/images/application/social/yelp_32.png
  124. BIN {public → app/assets}/images/application/social/youtube_16.png
  125. BIN {public → app/assets}/images/application/social/youtube_32.png
  126. BIN {public → app/assets}/images/application/startup.png
  127. BIN {public → app/assets}/images/application/ucsd.gif
  128. BIN {public → app/assets}/images/home/tshirt.gif
  129. BIN {public → app/assets}/images/users/avatar.gif
  130. BIN {public → app/assets}/images/users/avatar_large.png
  131. BIN {public → app/assets}/images/users/avatar_medium.png
  132. BIN {public → app/assets}/images/users/avatar_small.png
  133. 0 {public → app/assets}/javascripts/application.js
  134. +9 −0 app/assets/javascripts/application.js.coffee
  135. 0 {public → app/assets}/javascripts/controls.js
  136. 0 {public → app/assets}/javascripts/dragdrop.js
  137. 0 {public → app/assets}/javascripts/effects.js
  138. 0 {public → app/assets}/javascripts/iphone-style-checkboxes.js
  139. 0 {public → app/assets}/javascripts/jquery-1.3.2.min.js
  140. 0 {public → app/assets}/javascripts/prototype.js
  141. +7 −0 app/assets/stylesheets/application.css.scss
  142. 0 {public/sass → app/assets/stylesheets}/application.sass
  143. 0 {public/sass → app/assets/stylesheets}/iphone.sass
  144. +4 −8 app/controllers/application_controller.rb
  145. +6 −8 app/helpers/application_helper.rb
  146. 0 app/mailers/.gitkeep
  147. +1 −0 app/views/layouts/application.haml
  148. +4 −0 config.ru
  149. +51 −0 config/application.rb
  150. +4 −126 config/boot.rb
  151. +18 −35 config/database.example.yml
  152. +4 −84 config/environment.rb
  153. +26 −13 config/environments/development.rb
  154. +53 −17 config/environments/production.rb
  155. +34 −17 config/environments/test.rb
  156. +7 −0 config/initializers/backtrace_silencers.rb
  157. +1 −1 config/initializers/inflections.rb
  158. +7 −0 config/initializers/secret_token.rb
  159. +8 −0 config/initializers/session_store.rb
  160. +14 −0 config/initializers/wrap_parameters.rb
  161. +2 −2 config/locales/en.yml
  162. +0 −21 config/preinitializer.rb
  163. +14 −20 config/routes.rb
  164. +7 −0 db/seeds.rb
  165. 0 lib/assets/.gitkeep
  166. +15 −19 public/404.html
  167. +15 −19 public/422.html
  168. +14 −21 public/500.html
  169. +0 −4 script/about
  170. +0 −5 script/autospec
  171. +0 −3 script/console
  172. +0 −10 script/cucumber
  173. +0 −3 script/dbconsole
  174. +0 −3 script/destroy
  175. +0 −3 script/generate
  176. +0 −3 script/performance/benchmarker
  177. +0 −3 script/performance/profiler
  178. +0 −3 script/performance/request
  179. +0 −3 script/plugin
  180. +0 −3 script/process/inspector
  181. +0 −3 script/process/reaper
  182. +0 −3 script/process/spawner
  183. +6 −0 script/rails
  184. +0 −3 script/runner
  185. +0 −3 script/server
  186. +0 −5 script/spec
  187. +0 −125 script/spec_server
View
@@ -5,10 +5,6 @@ tmp/**/*
config/database.yml
config/fuzzy.yml
config/password.txt
-public/stylesheets/*
-public/images/screenshots/*
-public/images/users/avatars/*
-db/development.sqlite3
-db/test.sqlite3
+db/*.sqlite3
.idea/*
.bundle
View
62 Gemfile
@@ -1,42 +1,42 @@
-source "http://rubygems.org"
+source :rubygems
-gem "rails", "2.3.10"
-gem "mysql"
-gem "haml"
-gem "newrelic_rpm", "~> 2.9.5"
-gem "rdiscount", "~> 1.3.5"
-gem "authlogic", "~> 2.1.1"
-gem "will_paginate", "~> 2.3.11"
-gem "hpricot", "~> 0.8.1"
-gem "chronic", "~> 0.2.3"
-gem "rack-recaptcha", :require => "rack/recaptcha"
+gem 'rails', '3.1.3'
+
+gem 'mysql2'
+gem 'jquery-rails'
+gem 'haml'
+gem 'newrelic_rpm'
+gem 'authlogic'
+gem 'will_paginate'
+gem 'hpricot'
+gem 'chronic'
+gem 'rack-recaptcha', :require => 'rack/recaptcha'
+
+group :assets do
+ gem 'sass-rails', '~> 3.1.5'
+ gem 'coffee-rails', '~> 3.1.1'
+ gem 'uglifier', '>= 1.0.3'
+end
group :development do
- gem "ruby-debug"
+ gem 'ruby-debug', platforms: :ruby_18
+ gem 'ruby-debug19', platforms: :ruby_19
end
-group :test do
- gem "rspec", "~> 1.3.1"
- gem "rspec-rails", "~> 1.3.2"
- gem "shoulda", "~> 2.11.3"
- gem "faker", "~> 0.3.1"
- gem "factory_girl", "~> 1.3.2"
+group :test, :cucumber do
+ gem "rspec-rails"
+ gem "shoulda"
+ gem "faker"
+ gem "factory_girl"
gem "vcr"
gem "webmock"
end
group :cucumber do
- gem "rspec", "~> 1.3.1"
- gem "rspec-rails", "~> 1.3.2"
- gem "shoulda", "~> 2.11.3"
- gem "faker", "~> 0.3.1"
- gem "factory_girl", "~> 1.3.2"
- gem "vcr"
- gem "webmock"
- gem "cucumber", "~> 0.9.3"
- gem "cucumber-rails", "~> 0.3.2"
- gem "pickle", "~> 0.4.2"
- gem "capybara", "~> 0.4.0"
- gem "xpath", "~> 0.1.2"
- gem "launchy", "~> 0.3.7"
+ gem "cucumber"
+ gem "cucumber-rails"
+ gem "pickle"
+ gem "capybara"
+ gem "xpath"
+ gem "launchy"
end
Oops, something went wrong.

0 comments on commit bf59321

Please sign in to comment.