diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-01-18 09:15:19 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-01-18 09:15:19 -0500 |
| commit | 8aebe30ef4d3d169bfb0900f4f4b396b74c8d20a (patch) | |
| tree | 9406b572ea9d9fadcfabca94084834e1188f8c25 /actionpack | |
| parent | 637a7d9d357a0f3f725b0548282ca8c5e7d4af4a (diff) | |
| download | rails-8aebe30ef4d3d169bfb0900f4f4b396b74c8d20a.tar.gz rails-8aebe30ef4d3d169bfb0900f4f4b396b74c8d20a.tar.bz2 rails-8aebe30ef4d3d169bfb0900f4f4b396b74c8d20a.zip | |
Revert "Merge pull request #8989 from robertomiranda/use-rails-4-find-by"
This reverts commit 637a7d9d357a0f3f725b0548282ca8c5e7d4af4a, reversing
changes made to 5937bd02dee112646469848d7fe8a8bfcef5b4c1.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/abstract_controller/helpers.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal/http_authentication.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/abstract_controller/helpers.rb b/actionpack/lib/abstract_controller/helpers.rb index 93bb1d7189..812a35735f 100644 --- a/actionpack/lib/abstract_controller/helpers.rb +++ b/actionpack/lib/abstract_controller/helpers.rb @@ -29,7 +29,7 @@ module AbstractController # helper_method :current_user, :logged_in? # # def current_user - # @current_user ||= User.find_by(id: session[:user]) + # @current_user ||= User.find_by_id(session[:user]) # end # # def logged_in? diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb index 308b386d9a..e295002b16 100644 --- a/actionpack/lib/action_controller/metal/http_authentication.rb +++ b/actionpack/lib/action_controller/metal/http_authentication.rb @@ -29,7 +29,7 @@ module ActionController # # protected # def set_account - # @account = Account.find_by(url_name: request.subdomains.first) + # @account = Account.find_by_url_name(request.subdomains.first) # end # # def authenticate @@ -344,7 +344,7 @@ module ActionController # # protected # def set_account - # @account = Account.find_by(url_name: request.subdomains.first) + # @account = Account.find_by_url_name(request.subdomains.first) # end # # def authenticate diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 9a41b27108..d8206b573d 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -275,7 +275,7 @@ module ActionController # assert_response :found # # # Assert that the controller really put the book in the database. - # assert_not_nil Book.find_by(title: "Love Hina") + # assert_not_nil Book.find_by_title("Love Hina") # end # end # |