Permalink
Browse files

Update rails dependency to version 4.0.1

  • Loading branch information...
sferik committed Dec 2, 2013
1 parent 11ac714 commit 4cfa9ad5c7c503243739536f6b2150ccc607bef0
Showing with 385 additions and 323 deletions.
  1. +5 −4 .gitignore
  2. +1 −2 Gemfile
  3. +62 −78 Gemfile.lock
  4. +0 −1 Rakefile
  5. 0 app/assets/images/.keep
  6. +3 −3 app/assets/javascripts/application.js
  7. +3 −5 app/assets/javascripts/main.js.erb
  8. +1 −1 app/controllers/addresses_controller.rb
  9. +3 −1 app/controllers/application_controller.rb
  10. 0 app/controllers/concerns/.keep
  11. +4 −4 app/controllers/passwords_controller.rb
  12. +2 −2 app/controllers/reminders_controller.rb
  13. +5 −3 app/controllers/sessions_controller.rb
  14. +2 −2 app/controllers/things_controller.rb
  15. +6 −6 app/controllers/users_controller.rb
  16. 0 app/mailers/.keep
  17. +3 −3 app/mailers/thing_mailer.rb
  18. 0 app/models/.keep
  19. 0 app/models/concerns/.keep
  20. +2 −2 app/models/reminder.rb
  21. +1 −1 app/models/thing.rb
  22. +6 −6 app/models/user.rb
  23. +3 −0 bin/bundle
  24. +4 −0 bin/rails
  25. +4 −0 bin/rake
  26. +1 −1 config.ru
  27. +3 −43 config/application.rb
  28. +0 −2 config/boot.rb
  29. +2 −2 config/environment.rb
  30. +11 −19 config/environments/development.rb
  31. +41 −27 config/environments/production.rb
  32. +13 −14 config/environments/test.rb
  33. +4 −0 config/initializers/filter_parameter_logging.rb
  34. +6 −5 config/initializers/inflections.rb
  35. +9 −4 config/initializers/secret_token.rb
  36. +0 −5 config/initializers/session_store.rb
  37. +6 −6 config/initializers/wrap_parameters.rb
  38. 0 lib/assets/.keep
  39. 0 lib/tasks/.keep
  40. 0 log/.keep
  41. +43 −11 public/404.html
  42. +43 −11 public/422.html
  43. +43 −11 public/500.html
  44. +1 −1 public/robots.txt
  45. 0 test/controllers/.keep
  46. 0 test/fixtures/.keep
  47. +8 −8 test/functional/addresses_controller_test.rb
  48. +4 −4 test/functional/info_window_controller_test.rb
  49. +7 −7 test/functional/passwords_controller_test.rb
  50. +3 −3 test/functional/reminders_controller_test.rb
  51. +3 −3 test/functional/sessions_controller_test.rb
  52. +1 −1 test/functional/sitemaps_controller_test.rb
  53. +2 −2 test/functional/things_controller_test.rb
  54. +7 −7 test/functional/users_controller_test.rb
  55. 0 test/helpers/.keep
  56. 0 test/integration/.keep
  57. 0 test/mailers/.keep
  58. 0 test/models/.keep
  59. +4 −2 test/test_helper.rb
  60. 0 vendor/assets/javascripts/.keep
  61. 0 vendor/assets/stylesheets/.keep
View
@@ -1,17 +1,18 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
-# git config --global core.excludesfile ~/.gitignore_global
+# git config --global core.excludesfile '~/.gitignore_global'
-# Ignore bundler config
+# Ignore bundler config.
/.bundle
-# Include SimpleCov directory
+# Ignore SimpleCov directory.
/coverage
# Ignore the default SQLite database.
/db/*.sqlite3
+/db/*.sqlite3-journal
# Ignore all logfiles and tempfiles.
/log/*.log
View
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
ruby '2.0.0'
-gem 'rails', '~> 3.2'
+gem 'rails', '~> 4.0.1'
gem 'arel'
gem 'devise'
@@ -12,7 +12,6 @@ gem 'nokogiri'
gem 'pg'
gem 'rails_12factor'
gem 'rails_admin'
-gem 'strong_parameters'
gem 'validates_formatting_of'
platforms :ruby_18 do
View
@@ -1,46 +1,41 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.2.15)
- actionpack (= 3.2.15)
+ actionmailer (4.0.1)
+ actionpack (= 4.0.1)
mail (~> 2.5.4)
- actionpack (3.2.15)
- activemodel (= 3.2.15)
- activesupport (= 3.2.15)
- builder (~> 3.0.0)
+ actionpack (4.0.1)
+ activesupport (= 4.0.1)
+ builder (~> 3.1.0)
erubis (~> 2.7.0)
- journey (~> 1.0.4)
- rack (~> 1.4.5)
- rack-cache (~> 1.2)
- rack-test (~> 0.6.1)
- sprockets (~> 2.2.1)
- activemodel (3.2.15)
- activesupport (= 3.2.15)
- builder (~> 3.0.0)
- activerecord (3.2.15)
- activemodel (= 3.2.15)
- activesupport (= 3.2.15)
- arel (~> 3.0.2)
- tzinfo (~> 0.3.29)
- activeresource (3.2.15)
- activemodel (= 3.2.15)
- activesupport (= 3.2.15)
- activesupport (3.2.15)
+ rack (~> 1.5.2)
+ rack-test (~> 0.6.2)
+ activemodel (4.0.1)
+ activesupport (= 4.0.1)
+ builder (~> 3.1.0)
+ activerecord (4.0.1)
+ activemodel (= 4.0.1)
+ activerecord-deprecated_finders (~> 1.0.2)
+ activesupport (= 4.0.1)
+ arel (~> 4.0.0)
+ activerecord-deprecated_finders (1.0.3)
+ activesupport (4.0.1)
i18n (~> 0.6, >= 0.6.4)
- multi_json (~> 1.0)
+ minitest (~> 4.2)
+ multi_json (~> 1.3)
+ thread_safe (~> 0.1)
+ tzinfo (~> 0.3.37)
addressable (2.3.5)
- arel (3.0.3)
+ arel (4.0.1)
atomic (1.1.14)
bcrypt-ruby (3.1.2)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
- bootstrap-sass (2.3.2.2)
- sass (~> 3.2)
- builder (3.0.4)
+ builder (3.1.4)
coderay (1.1.0)
- coffee-rails (3.2.2)
+ coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
- railties (~> 3.2.0)
+ railties (>= 4.0.0, < 5.0)
coffee-script (2.2.0)
coffee-script-source
execjs
@@ -71,7 +66,7 @@ GEM
erubis (2.7.0)
execjs (2.0.2)
fastercsv (1.5.5)
- font-awesome-rails (3.2.1.3)
+ font-awesome-rails (4.0.3.0)
railties (>= 3.2, < 5.0)
geokit (1.7.1)
multi_json (>= 1.3.2)
@@ -81,12 +76,10 @@ GEM
http_accept_language (2.0.0)
i18n (0.6.5)
interception (0.3)
- journey (1.0.4)
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- jquery-ui-rails (3.0.1)
- jquery-rails
+ jquery-ui-rails (4.1.0)
railties (>= 3.1.0)
json (1.8.1)
kaminari (0.15.0)
@@ -98,6 +91,7 @@ GEM
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.5.2)
+ minitest (4.7.5)
multi_json (1.8.2)
nested_form (0.3.2)
nokogiri (1.6.0)
@@ -120,79 +114,70 @@ GEM
pry (>= 0.9.11)
puma (2.6.0)
rack (>= 1.1, < 2.0)
- rack (1.4.5)
- rack-cache (1.2)
- rack (>= 0.4)
+ rack (1.5.2)
rack-pjax (0.7.0)
nokogiri (~> 1.5)
rack (~> 1.3)
- rack-ssl (1.3.3)
- rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.15)
- actionmailer (= 3.2.15)
- actionpack (= 3.2.15)
- activerecord (= 3.2.15)
- activeresource (= 3.2.15)
- activesupport (= 3.2.15)
- bundler (~> 1.0)
- railties (= 3.2.15)
+ rails (4.0.1)
+ actionmailer (= 4.0.1)
+ actionpack (= 4.0.1)
+ activerecord (= 4.0.1)
+ activesupport (= 4.0.1)
+ bundler (>= 1.3.0, < 2.0)
+ railties (= 4.0.1)
+ sprockets-rails (~> 2.0.0)
rails_12factor (0.0.2)
rails_serve_static_assets
rails_stdout_logging
- rails_admin (0.4.9)
- bootstrap-sass (~> 2.2)
- builder (~> 3.0)
- coffee-rails (>= 3.1, < 5)
- font-awesome-rails (~> 3.0)
+ rails_admin (0.6.0)
+ builder (~> 3.1)
+ coffee-rails (~> 4.0)
+ font-awesome-rails (>= 3.0)
haml (~> 4.0)
- jquery-rails (>= 2.1, < 4)
- jquery-ui-rails (~> 3.0)
+ jquery-rails (~> 3.0)
+ jquery-ui-rails (~> 4.0)
kaminari (~> 0.14)
nested_form (~> 0.3)
- rack-pjax (~> 0.6)
- rails (~> 3.1)
+ rack-pjax (~> 0.7)
+ rails (~> 4.0.0)
remotipart (~> 1.0)
- safe_yaml (~> 0.6)
- sass-rails (~> 3.1)
+ safe_yaml (~> 0.9)
+ sass-rails (~> 4.0)
rails_serve_static_assets (0.0.1)
rails_stdout_logging (0.0.3)
- railties (3.2.15)
- actionpack (= 3.2.15)
- activesupport (= 3.2.15)
- rack-ssl (~> 1.3.2)
+ railties (4.0.1)
+ actionpack (= 4.0.1)
+ activesupport (= 4.0.1)
rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (>= 0.14.6, < 2.0)
+ thor (>= 0.18.1, < 2.0)
rake (10.1.0)
- rdoc (3.12.2)
- json (~> 1.4)
remotipart (1.2.1)
rest-client (1.6.7)
mime-types (>= 1.16)
safe_yaml (0.9.7)
sass (3.2.12)
- sass-rails (3.2.6)
- railties (~> 3.2.0)
+ sass-rails (4.0.1)
+ railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10)
- tilt (~> 1.3)
+ sprockets-rails (~> 2.0.0)
simplecov (0.8.2)
docile (~> 1.1.0)
multi_json
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
slop (3.4.7)
- sprockets (2.2.2)
+ sprockets (2.10.1)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
+ sprockets-rails (2.0.1)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ sprockets (~> 2.8)
sqlite3 (1.3.8)
- strong_parameters (0.2.1)
- actionpack (~> 3.0)
- activemodel (~> 3.0)
- railties (~> 3.0)
term-ansicolor (1.2.2)
tins (~> 0.8)
thor (0.18.1)
@@ -207,8 +192,8 @@ GEM
uglifier (2.3.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
- validates_formatting_of (0.8.0)
- activemodel (~> 3.0)
+ validates_formatting_of (0.8.1)
+ activemodel (~> 4.0)
warden (1.2.3)
rack (>= 1.0)
webmock (1.16.0)
@@ -233,13 +218,12 @@ DEPENDENCIES
pry-rescue
pry-stack_explorer
puma
- rails (~> 3.2)
+ rails (~> 4.0.1)
rails_12factor
rails_admin
sass-rails
simplecov
sqlite3
- strong_parameters
uglifier
validates_formatting_of
webmock
View
@@ -1,4 +1,3 @@
-#!/usr/bin/env rake
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
View
No changes.
@@ -5,9 +5,9 @@
// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
//
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
+// compiled file.
//
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
//
//= require_tree .
@@ -91,7 +91,6 @@ $(function() {
url: '/things.json',
data: {
'utf8': '✓',
- 'authenticity_token': $('#address_form input[name="authenticity_token"]').val(),
'lat': lat,
'lng': lng,
'limit': $('#address_form input[name="limit"]').val()
@@ -145,7 +144,6 @@ $(function() {
url: '/address.json',
data: {
'utf8': '✓',
- 'authenticity_token': $('#address_form input[name="authenticity_token"]').val(),
'city_state': $('#city_state').val(),
'address': $('#address').val()
},
@@ -380,10 +378,10 @@ $(function() {
type: 'POST',
url: '/things.json',
data: {
+ '_method': 'patch',
'id': $('#thing_id').val(),
'utf8': '✓',
'authenticity_token': $('#adoption_form input[name="authenticity_token"]').val(),
- '_method': 'put',
'thing': {
'user_id': $('#thing_user_id').val(),
'name': $('#thing_name').val()
@@ -423,10 +421,10 @@ $(function() {
type: 'POST',
url: '/things.json',
data: {
+ '_method': 'patch',
'id': $('#thing_id').val(),
'utf8': '✓',
'authenticity_token': $('#abandon_form input[name="authenticity_token"]').val(),
- '_method': 'put',
'thing': {
'user_id': $('#thing_user_id').val(),
'name': $('#thing_name').val()
@@ -515,11 +513,11 @@ $(function() {
type: 'POST',
url: '/users.json',
data: {
+ '_method': 'patch',
'id': $('#id').val(),
'thing_id': activeThingId,
'utf8': '✓',
'authenticity_token': $('#edit_form input[name="authenticity_token"]').val(),
- '_method': 'put',
'user': {
'email': $('#user_email').val(),
'name': $('#user_name').val(),
@@ -6,7 +6,7 @@ def show
unless @address.blank?
respond_with @address
else
- render(json: {errors: {address: [t("errors.not_found", thing: t("defaults.address"))]}}, status: 404)
+ render(:json => {:errors => {:address => [t("errors.not_found", :thing => t("defaults.address"))]}}, :status => 404)
end
end
end
@@ -1,5 +1,7 @@
class ApplicationController < ActionController::Base
- protect_from_forgery
+ # Prevent CSRF attacks by raising an exception.
+ # For APIs, you may want to use :null_session instead.
+ protect_from_forgery :with => :exception
before_filter :set_flash_from_params
before_filter :set_locale
No changes.
@@ -3,16 +3,16 @@ def create
self.resource = resource_class.send_reset_password_instructions(resource_params)
yield resource if block_given?
if successfully_sent?(resource)
- render(json: {success: true})
+ render(:json => {:success => true})
else
- render(json: {errors: resource.errors}, status: 500)
+ render(:json => {:errors => resource.errors}, :status => 500)
end
end
def edit
self.resource = resource_class.new
resource.reset_password_token = params[:reset_password_token]
- render("edit", layout: "info_window")
+ render("edit", :layout => "info_window")
end
def update
@@ -22,7 +22,7 @@ def update
resource.unlock_access! if unlockable?(resource)
sign_in(resource_name, resource)
end
- redirect_to(controller: "main", action: "index")
+ redirect_to(:controller => "main", :action => "index")
end
private
Oops, something went wrong.

0 comments on commit 4cfa9ad

Please sign in to comment.