aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | Tender love for #9909 :heart:Jeremy Kemper2013-03-241-1/+1
| | |
* | | Introduce UpgradeLegacySignedCookieJar to transparently upgrade existing ↵Trevor Turk2013-03-243-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-routesJeremy Kemper2013-03-243-20/+31
|\ \ \ | | | | | | | | Raise an ArgumentError when a clashing named route is defined
| * | | Tweak exception message to avoid giving potentially misleading suggestionsTrevor Turk2013-03-201-2/+3
| | | |
| * | | Raise an ArgumentError when a clashing named route is definedTrevor Turk2013-03-193-20/+30
| | | |
* | | | Fix some typosVipul A M2013-03-242-2/+2
| | | |
* | | | Merge pull request #8501 from charliesome/version-to-sRafael Mendonça França2013-03-231-6/+7
|\ \ \ \ | | | | | | | | | | Add #to_s method to VERSION modules
| * | | | Add version method to top level modulesCharlie Somerville2013-03-211-6/+7
| | | | |
* | | | | Changed 'args' to 'arguments' in test descriptionPrathamesh Sonpatki2013-03-242-2/+2
| | | | |
* | | | | Fix documentation markup [ci skip]Rafael Mendonça França2013-03-231-0/+2
| | | | |
* | | | | StringIO is not required by default in JRubyArun Agrawal2013-03-221-0/+1
|/ / / /
* | | | Merge pull request #9802 from newsline/fix-broken-action-missingRafael Mendonça França2013-03-202-1/+13
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix missing action_missing Conflicts: actionpack/CHANGELOG.md
| * | | Fix broken ActionController#action_missingJanko Luin2013-03-203-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-hostAndrew White2013-03-193-1/+26
|\ \ \ \ | | | | | | | | | | Fix improperly configured host in generated urls
| * | | | Fix improperly configured host in generated urlsschneems2013-03-193-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 Silva2013-03-191-12/+10
|/ / /
* | | drop an unused hash; change slang to SPECIALVipul A M2013-03-191-2/+2
| | |
* | | Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]"Xavier Noria2013-03-181-1/+1
| | | | | | | | | | | | This reverts commit c24528fbc94dea9946a563be3bed9559583bdc57.
* | | instruct RDoc to only parse Ruby files under lib [Fixes #9779]Xavier Noria2013-03-181-1/+1
| | |
* | | Digest auth should not 500 when given a basic header.Brad Dunbar2013-03-183-0/+14
| | |
* | | Merge branch 'master-sec'Aaron Patterson2013-03-182-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 Patterson2013-03-152-2/+12
| | | |
| * | | fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]Charlie Somerville2013-03-152-3/+8
| | | |
* | | | Merge pull request #9753 from jbarreneche/bug/render-locale-fallbacksCarlos Antonio da Silva2013-03-183-1/+21
|\ \ \ \ | | | | | | | | | | i18n locale fallback for localized views
| * | | | Include I18n fallbacks in :locale lookup contextJuan Barreneche2013-03-163-1/+21
| | | | |
* | | | | remove ancient TODOs [ci skip].Yves Senn2013-03-182-3/+0
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 00:12:34 +0000