Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | each_with_index => each as we dont use index | Vipul A M | 2013-04-03 | 1 | -1/+1 |
| | |||||
* | Fixed typo on AP dispatch Mime::Type test | KalabiYau | 2013-04-01 | 1 | -1/+1 |
| | |||||
* | Improve documentation around the cookie store auto-upgrade to encryption | Trevor Turk | 2013-04-01 | 1 | -22/+37 |
| | |||||
* | Merge pull request #9978 from trevorturk/cookie-store-auto-upgrade | Santiago Pastorino | 2013-04-01 | 5 | -78/+162 |
|\ | | | | | Cookie-base session store auto-upgrade | ||||
| * | Allow transparent upgrading of legacy signed cookies to encrypted cookies; ↵ | Trevor Turk | 2013-03-28 | 5 | -78/+162 |
| | | | | | | | | Automatically configure cookie-based sessions to use the best cookie jar given the app's config | ||||
* | | typo recomend -> recommend | ogawaso | 2013-04-01 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #9680 from bdmac/time-zone-options-revert-grep-to-select | Carlos Antonio da Silva | 2013-03-31 | 2 | -4/+23 |
|\ \ | | | | | | | Revert grep to select since they are not the same | ||||
| * | | Add regression test for TZ grep | Brian McManus | 2013-03-27 | 1 | -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 same | Brian McManus | 2013-03-27 | 2 | -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_test | Santiago Pastorino | 2013-03-31 | 1 | -6/+2 |
|\ \ \ | | | | | | | | | fix request methods test | ||||
| * | | | fix request methods test | Vipul A M | 2013-03-31 | 1 | -6/+2 |
| | | | | |||||
* | | | | Merge pull request #10015 from vipulnsward/remove_unused_variable_in_get | Steve Klabnik | 2013-03-31 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | remove unused variable and assignment | ||||
| * | | | | remove unused variable and assignment | Vipul A M | 2013-03-31 | 2 | -2/+2 |
| |/ / / | |||||
* | | | | Merge pull request #10014 from vipulnsward/remove_unused_match_var | Steve Klabnik | 2013-03-31 | 1 | -8/+8 |
|\ \ \ \ | | | | | | | | | | | remove unused match variables in selector | ||||
| * | | | | remove unused match variables in selector | Vipul A M | 2013-03-31 | 1 | -8/+8 |
| |/ / / | |||||
* / / / | fix wrong argument error message | Vipul A M | 2013-03-31 | 1 | -1/+1 |
|/ / / | |||||
* | | | Improve AP changelog entry about layout method with nil return | Carlos Antonio da Silva | 2013-03-30 | 1 | -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 Silva | 2013-03-30 | 5 | -36/+36 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-03-30 | 6 | -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 typo | Carson McDonald | 2013-03-26 | 1 | -1/+1 |
| | | | |||||
| * | | Reverted code change introduced in d45145acdc576e46a1f1719d69bec96b5bf07b0a | Prathamesh Sonpatki | 2013-03-24 | 2 | -2/+2 |
| | | | |||||
| * | | Changed 'args' to 'arguments' when used in places other than code with ↵ | Prathamesh Sonpatki | 2013-03-24 | 2 | -2/+2 |
| | | | | | | | | | | | | fixing few more typos | ||||
| * | | Remove duplicated accepts_nested_attributes description | ma2gedev | 2013-03-22 | 1 | -16/+0 |
| | | | | | | | | | | | | there are just the same description about accepts_nested_attributes [ci skip] | ||||
| * | | Undo bad change in cf0931166be13dbbe660 | Steve Klabnik | 2013-03-19 | 1 | -1/+1 |
| | | | | | | | | | I didn't know that this was about RDoc! | ||||
| * | | Fixed small typos | Prathamesh Sonpatki | 2013-03-19 | 2 | -2/+2 |
| | | | |||||
| * | | The HTTP method helpers are preferred over match and should be explained ↵ | Trevor Turk | 2013-03-18 | 1 | -28/+16 |
| | | | | | | | | | | | | before named routes | ||||
| * | | The default route has been removed | Trevor Turk | 2013-03-18 | 1 | -24/+0 |
| | | | |||||
| * | | Using match without via is deprecated | Trevor Turk | 2013-03-18 | 1 | -12/+12 |
| | | | |||||
| * | | Capitalize the first letter of sentence | Tatsuro Baba | 2013-03-18 | 1 | -1/+1 |
| | | | |||||
| * | | Remove :all from *args options in AbstractController.helper | Bryan Ricker | 2013-03-16 | 1 | -1/+1 |
| | | | |||||
* | | | Removed unused variable in proc | Prathamesh Sonpatki | 2013-03-28 | 1 | -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_cases | Carlos Antonio da Silva | 2013-03-28 | 2 | -3/+3 |
|\ \ \ | | | | | | | | | Refactored to remove unused loop variable | ||||
| * | | | Refactored to remove unused variable | Anupam Choudhury | 2013-03-28 | 2 | -3/+3 |
| | |/ | |/| | |||||
* / | | Fixed grammar | Anupam Choudhury | 2013-03-28 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #8458 from ↵ | Rafael Mendonça França | 2013-03-27 | 4 | -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 cases | Chris Nicola | 2013-03-27 | 4 | -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. | kennyj | 2013-03-26 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #9874 from arunagw/skipping-test-for-openssl-pkcs5 | Rafael Mendonça França | 2013-03-25 | 1 | -0/+10 |
|\ \ \ | | | | | | | | | Skipping test for OpenSSL::PKCS5 JRuby | ||||
| * | | | Skipping test for OpenSSL::PKCS5 JRuby | Arun Agrawal | 2013-03-25 | 1 | -0/+10 |
| | | | | |||||
* | | | | if cookie is tampered with then nil is returned [ci skip] | Neeraj Singh | 2013-03-25 | 1 | -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 collisions | Jeremy Kemper | 2013-03-24 | 2 | -6/+7 |
| | | | | | | | | | | | | | | | * Fix named route collision in mount test fixture * Update controller named route precedence test | ||||
* | | | Tender love for #9909 :heart: | Jeremy Kemper | 2013-03-24 | 1 | -1/+1 |
| | | | |||||
* | | | Introduce UpgradeLegacySignedCookieJar to transparently upgrade existing ↵ | Trevor Turk | 2013-03-24 | 3 | -99/+159 |
| | | | | | | | | | | | | signed cookies generated by Rails 3 to avoid invalidating them when upgrading to Rails 4 | ||||
* | | | Merge pull request #9704 from trevorturk/warn-about-skipped-routes | Jeremy Kemper | 2013-03-24 | 3 | -20/+31 |
|\ \ \ | | | | | | | | | Raise an ArgumentError when a clashing named route is defined | ||||
| * | | | Tweak exception message to avoid giving potentially misleading suggestions | Trevor Turk | 2013-03-20 | 1 | -2/+3 |
| | | | | |||||
| * | | | Raise an ArgumentError when a clashing named route is defined | Trevor Turk | 2013-03-19 | 3 | -20/+30 |
| | | | | |||||
* | | | | Fix some typos | Vipul A M | 2013-03-24 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #8501 from charliesome/version-to-s | Rafael Mendonça França | 2013-03-23 | 1 | -6/+7 |
|\ \ \ \ | | | | | | | | | | | Add #to_s method to VERSION modules | ||||
| * | | | | Add version method to top level modules | Charlie Somerville | 2013-03-21 | 1 | -6/+7 |
| | | | | | |||||
* | | | | | Changed 'args' to 'arguments' in test description | Prathamesh Sonpatki | 2013-03-24 | 2 | -2/+2 |
| | | | | |