Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | 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 | |
| | | | | | | ||||||
* | | | | | | Fix documentation markup [ci skip] | Rafael Mendonça França | 2013-03-23 | 1 | -0/+2 | |
| | | | | | | ||||||
* | | | | | | StringIO is not required by default in JRuby | Arun Agrawal | 2013-03-22 | 1 | -0/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #9802 from newsline/fix-broken-action-missing | Rafael Mendonça França | 2013-03-20 | 2 | -1/+13 | |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Fix missing action_missing Conflicts: actionpack/CHANGELOG.md | |||||
| * | | | | Fix broken ActionController#action_missing | Janko Luin | 2013-03-20 | 3 | -1/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | A recent change introduced the assumption that all controller actions are known beforehand, which is not true when using action_missing. | |||||
* | | | | | Merge pull request #9794 from schneems/schneems/email-host | Andrew White | 2013-03-19 | 3 | -1/+26 | |
|\ \ \ \ \ | | | | | | | | | | | | | Fix improperly configured host in generated urls | |||||
| * | | | | | Fix improperly configured host in generated urls | schneems | 2013-03-19 | 3 | -1/+26 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the host in `default_url_options` is accidentally set with a protocol such as ``` host: "http://example.com" ``` then the generated url will have the protocol twice `http://http://example.com` which is not what the user intended. Likely they wanted to define a host `host: "example.com"` and a `protocol: "http://"` but did not know the convention. This may not the most common problem, but when it happens it can go undetected for a while. I accidentally added `http://` out of habit recently only to find all the links in my emails were broken after deploying a demo site to production. Rather than allow this accident go undetected, we can fix the problem in line by properly setting the protocol and host. I was able to find this related question on stack overflow: http://stackoverflow.com/questions/5878329/rails-3-devise-how-do-i-make-the-email-confirmation-links-use-secure-https-n where the answer was highly upvoted. This is based off of work in #7415 cc/ @pixeltrix ATP Action Mailer and Action Pack | |||||
* / / / / | Remove mentions of "app" from http request docs [ci skip] | Carlos Antonio da Silva | 2013-03-19 | 1 | -12/+10 | |
|/ / / / | ||||||
* | | | | drop an unused hash; change slang to SPECIAL | Vipul A M | 2013-03-19 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]" | Xavier Noria | 2013-03-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | This reverts commit c24528fbc94dea9946a563be3bed9559583bdc57. | |||||
* | | | | instruct RDoc to only parse Ruby files under lib [Fixes #9779] | Xavier Noria | 2013-03-18 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Digest auth should not 500 when given a basic header. | Brad Dunbar | 2013-03-18 | 3 | -0/+14 | |
| | | | | ||||||
* | | | | Merge branch 'master-sec' | Aaron Patterson | 2013-03-18 | 2 | -5/+20 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master-sec: fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854] | |||||
| * | | | | fix protocol checking in sanitization [CVE-2013-1857] | Aaron Patterson | 2013-03-15 | 2 | -2/+12 | |
| | | | | | ||||||
| * | | | | fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] | Charlie Somerville | 2013-03-15 | 2 | -3/+8 | |
| | | | | | ||||||
* | | | | | Merge pull request #9753 from jbarreneche/bug/render-locale-fallbacks | Carlos Antonio da Silva | 2013-03-18 | 3 | -1/+21 | |
|\ \ \ \ \ | | | | | | | | | | | | | i18n locale fallback for localized views | |||||
| * | | | | | Include I18n fallbacks in :locale lookup context | Juan Barreneche | 2013-03-16 | 3 | -1/+21 | |
| | | | | | | ||||||
* | | | | | | remove ancient TODOs [ci skip]. | Yves Senn | 2013-03-18 | 2 | -3/+0 | |
| | | | | | |