aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Fix grammatical error on JS helper warning messagethenickcox2013-04-021-2/+2
| | | | | | Add changelog entry Delete changelog
* Getting rid of a few other vestiges of rails.png.Steve Klabnik2013-04-021-0/+0
| | | | | | | | | | We don't actually need a rails.png in the AP fixtures, the tests that use it don't actually try to load the file. We also don't need to get rid of it with the dummy reset either. Finally, it's not needed in the sample application that's included with the Rails Guides.
* Merge pull request #10061 from trevorturk/dummy-key-generator-renameSantiago Pastorino2013-04-025-13/+13
|\ | | | | Rename DummyKeyGenerator -> LegacyKeyGenerator
| * Rename DummyKeyGenerator -> LegacyKeyGeneratorTrevor Turk2013-04-025-13/+13
| |
* | :scissors: spacing after privateTrevor Turk2013-04-021-3/+0
| |
* | Be consistent when talking about cookies, key -> nameTrevor Turk2013-04-021-25/+25
| |
* | Fix permanent cookie jar accessor typoTrevor Turk2013-04-022-2/+7
|/
* Merge pull request #10054 from rubys/use_find_by_in_rdocSantiago Pastorino2013-04-023-4/+4
|\ | | | | Prefer find_by over dynamic finders in rdoc
| * Prefer find_by over dynamic finders in rdocSam Ruby2013-04-023-4/+4
| |
* | each_with_index => each as we dont use indexVipul A M2013-04-031-1/+1
|/
* Fixed typo on AP dispatch Mime::Type testKalabiYau2013-04-011-1/+1
|
* Improve documentation around the cookie store auto-upgrade to encryptionTrevor Turk2013-04-011-22/+37
|
* Merge pull request #9978 from trevorturk/cookie-store-auto-upgradeSantiago Pastorino2013-04-015-78/+162
|\ | | | | Cookie-base session store auto-upgrade
| * Allow transparent upgrading of legacy signed cookies to encrypted cookies; ↵Trevor Turk2013-03-285-78/+162
| | | | | | | | Automatically configure cookie-based sessions to use the best cookie jar given the app's config
* | typo recomend -> recommendogawaso2013-04-011-2/+2
| |
* | Merge pull request #9680 from bdmac/time-zone-options-revert-grep-to-selectCarlos Antonio da Silva2013-03-312-4/+23
|\ \ | | | | | | Revert grep to select since they are not the same
| * | Add regression test for TZ grepBrian McManus2013-03-271-0/+20
| | | | | | | | | | | | | | | | | | Added a regression test that will fail if anyone tries to change time_zone_select to use grep again thinking it will work when it does not.
| * | Revert grep to select since they are not the sameBrian McManus2013-03-272-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A previous commit swapped out a call to select for a call to grep in time_zone_options_for_select. This behavior actually causes the regexp priority option to stop working. ActiveSupport::TimeZone overrides the =~ operator which is what the select block was using previously. Enumerable#grep checks pattern === element and in this case that would be /US/ === ActiveSupport::TimeZone which does not work because ActiveSupport::TimeZone does not supply an implicit converting to_str method, only an explicit to_s method. It would be impossible to provide a to_str method that behaves identically to the =~ method provided on ActiveSupport::TimeZone so the only option is to revert back to using select with =~.
* | | Merge pull request #10013 from vipulnsward/fix_request_method_testSantiago Pastorino2013-03-311-6/+2
|\ \ \ | | | | | | | | fix request methods test
| * | | fix request methods testVipul A M2013-03-311-6/+2
| | | |
* | | | Merge pull request #10015 from vipulnsward/remove_unused_variable_in_getSteve Klabnik2013-03-312-2/+2
|\ \ \ \ | | | | | | | | | | remove unused variable and assignment
| * | | | remove unused variable and assignmentVipul A M2013-03-312-2/+2
| |/ / /
* | | | Merge pull request #10014 from vipulnsward/remove_unused_match_varSteve Klabnik2013-03-311-8/+8
|\ \ \ \ | | | | | | | | | | remove unused match variables in selector
| * | | | remove unused match variables in selectorVipul A M2013-03-311-8/+8
| |/ / /
* / / / fix wrong argument error messageVipul A M2013-03-311-1/+1
|/ / /
* | | Improve AP changelog entry about layout method with nil returnCarlos Antonio da Silva2013-03-301-4/+4
| | | | | | | | | | | | | | | | | | | | | Add a note about getting the "no layout" behavior by returning "false" to make it easier for people that might need to change their code. Related to #8458. [ci skip]
* | | Fix typos in AP: "overriden" => "overridden"Carlos Antonio da Silva2013-03-305-36/+36
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-306-84/+32
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/adapter_test.rb guides/source/testing.md [ci skip]
| * | Fix typoCarson McDonald2013-03-261-1/+1
| | |
| * | Reverted code change introduced in d45145acdc576e46a1f1719d69bec96b5bf07b0aPrathamesh Sonpatki2013-03-242-2/+2
| | |
| * | Changed 'args' to 'arguments' when used in places other than code with ↵Prathamesh Sonpatki2013-03-242-2/+2
| | | | | | | | | | | | fixing few more typos
| * | Remove duplicated accepts_nested_attributes descriptionma2gedev2013-03-221-16/+0
| | | | | | | | | | | | there are just the same description about accepts_nested_attributes [ci skip]
| * | Undo bad change in cf0931166be13dbbe660Steve Klabnik2013-03-191-1/+1
| | | | | | | | | I didn't know that this was about RDoc!
| * | Fixed small typosPrathamesh Sonpatki2013-03-192-2/+2
| | |
| * | The HTTP method helpers are preferred over match and should be explained ↵Trevor Turk2013-03-181-28/+16
| | | | | | | | | | | | before named routes
| * | The default route has been removedTrevor Turk2013-03-181-24/+0
| | |
| * | Using match without via is deprecatedTrevor Turk2013-03-181-12/+12
| | |
| * | Capitalize the first letter of sentenceTatsuro Baba2013-03-181-1/+1
| | |
| * | Remove :all from *args options in AbstractController.helperBryan Ricker2013-03-161-1/+1
| | |
* | | Removed unused variable in procPrathamesh Sonpatki2013-03-281-1/+1
| | | | | | | | | | | | | | | | | | * This unused variable is already removed from the code here. d18e8b1a3839c5c214e96c7e37e0d86febe15f99 * So removing it from CHANGELOG to be consistent with code
* | | Merge pull request #9967 from choudhuryanupam/fix_actionpack_test_casesCarlos Antonio da Silva2013-03-282-3/+3
|\ \ \ | | | | | | | | Refactored to remove unused loop variable
| * | | Refactored to remove unused variableAnupam Choudhury2013-03-282-3/+3
| | |/ | |/|
* / | Fixed grammarAnupam Choudhury2013-03-281-1/+1
|/ /
* | Merge pull request #8458 from ↵Rafael Mendonça França2013-03-274-5/+68
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | lucisferre/improve-layout-override-fallback-behavior Provides standard layout lookup behavior for method and proc cases Conflicts: actionpack/CHANGELOG.md
| * | Provides standard layout lookup behavior for method and proc casesChris Nicola2013-03-274-5/+67
| | | | | | | | | | | | | | | | | | | | | When setting the layout either by referencing a method or supplying a Proc there is no way to fall back to the default lookup behavior if desired. This patch allows fallback to the layout lookup behavior when returning nil from the proc or method.
* | | Bump TZInfo version to 0.3.37 based on version v2013b of the underlying tz data.kennyj2013-03-261-1/+1
| | |
* | | Merge pull request #9874 from arunagw/skipping-test-for-openssl-pkcs5Rafael Mendonça França2013-03-251-0/+10
|\ \ \ | | | | | | | | Skipping test for OpenSSL::PKCS5 JRuby
| * | | Skipping test for OpenSSL::PKCS5 JRubyArun Agrawal2013-03-251-0/+10
| | | |
* | | | if cookie is tampered with then nil is returned [ci skip]Neeraj Singh2013-03-251-4/+2
|/ / / | | | | | | | | | | | | | | | if the given key is not found then verifier does raise `ActiveSupport::MessageVerifier::InvalidSignature` exception but this exception is resuced and finally nil is returned.
* | | Update tests for #9704, named route collisionsJeremy Kemper2013-03-242-6/+7
| | | | | | | | | | | | | | | * Fix named route collision in mount test fixture * Update controller named route precedence test
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 04:16:25 +0000