aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master'Mark Thomson2012-03-1777-1264/+536
|\
| * Add missing requireSantiago Pastorino2012-03-171-0/+1
| |
| * Remove unused requireSantiago Pastorino2012-03-171-1/+0
| |
| * Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-171-4/+4
| |\ | | | | | | | | | | | | Conflicts: railties/guides/source/getting_started.textile
| | * Minor clarification in documentation language and spellingMatthew Daubert2012-03-131-4/+4
| | |
| * | Merge pull request #5480 from drogus/rendering-issuesJosé Valim2012-03-178-0/+46
| | | | | | | | | | | | Fix for #5440
| * | Should use an argument in http_digest_authentication_test.rbkennyj2012-03-171-1/+1
| | |
| * | Merge pull request #5470 from sandeepravi/warning_fixesJosé Valim2012-03-171-0/+5
| |\ \ | | | | | | | | fixed - warning: instance variable @controller not initialized
| | * | fixed - warning: instance variable @controller not initializedSandeep2012-03-161-0/+5
| | | |
| * | | use consistent explicit module inclusionLuke Gruber2012-03-163-6/+6
| |/ / | | | | | | | | | aid ease of understanding and readability for tests
| * | fixed - warning: ambiguous first argument; put parentheses or even spacesSandeep2012-03-161-1/+1
| | |
| * | Merge pull request #5365 from avakhov/ac-layouts-excpetion-msgsPiotr Sarnacki2012-03-161-2/+2
| |\ \ | | | | | | | | Fix exceptions messages in AC layouts
| | * | Fix exceptions messages in AC layoutsAlexey Vakhov2012-03-101-2/+2
| | | |
| * | | Merge pull request #5454 from luke-gru/luke-devPiotr Sarnacki2012-03-152-4/+44
| |\ \ \ | | | | | | | | | | allow zero-arity proc for AbstrController::layout
| | * | | allow zero-arity proc for AbstrController::layoutLuke Gruber2012-03-152-4/+44
| | | | | | | | | | | | | | | | | | | | | | | | | proc without parameters can now be given to AbstractController::layout
| * | | | fix typo in redirect testBrian Lopez2012-03-151-1/+1
| | | | |
| * | | | strip null bytes from Location header as wellBrian Lopez2012-03-153-2/+22
| |/ / / | | | | | | | | | | | | add tests for stripping \r\n chars since that's already happening
| * | | Merge pull request #5337 from mreinsch/static_invalid_byte_sequenceAaron Patterson2012-03-152-0/+5
| |\ \ \ | | | | | | | | | | fix ArgumentError being raised in case of invalid byte sequences
| | * | | fix ArgumentError being raised in case of invalid byte sequencesMichael Reinsch2012-03-082-0/+5
| | | | |
| * | | | Simplify helpers handling. Ensure Metal can run AC hooks.José Valim2012-03-154-35/+34
| | | | |
| * | | | Remove ActionController::TestCase#rescue_action_in_public!Piotr Sarnacki2012-03-152-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method has no effect since exception handling was moved to middlewares and ActionController tests do not use any middlewares.
| * | | | Allow you to force the authenticity_token to be rendered even on remote ↵David Heinemeier Hansson2012-03-142-5/+20
| | | | | | | | | | | | | | | | | | | | forms if you pass true
| * | | | Do not include the authenticity token in forms where remote: true as ajax ↵David Heinemeier Hansson2012-03-143-2/+27
| | | | | | | | | | | | | | | | | | | | forms use the meta-tag value
| * | | | Remove --http.José Valim2012-03-1411-338/+0
| | | | |
| * | | | Merge pull request #5357 from bagilevi/sweeper-undefined-method-ignoredPiotr Sarnacki2012-03-142-1/+17
| |\ \ \ \ | | | | | | | | | | | | Don't ignore call to undefined method in Sweeper
| | * | | | Don't ignore call to undefined method in SweeperLevente Bagi2012-03-062-1/+17
| | | | | |
| * | | | | Add API apps CHANGELOG entrySantiago Pastorino2012-03-141-0/+2
| | | | | |
| * | | | | Add ActionController::HTTPSantiago Pastorino2012-03-1415-8/+355
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More info http://edgeguides.rubyonrails.org/api_app.html [Carlos Antonio da Silva & Santiago Pastorino]
| * | | | | Merge pull request #5421 from parndt/masterVijay Dev2012-03-141-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Added missing 'end' to documentation example
| | * | | | | Added missing end to examplePhilip Arndt2012-03-141-0/+1
| | | | | | |
| * | | | | | Remove remaining sprockets testsGuillermo Iguaran2012-03-131-28/+0
| | | | | | |
| * | | | | | Remove sprockets dependency on actionpackGuillermo Iguaran2012-03-131-1/+0
| | | | | | |
| * | | | | | Remove tests and fixtures for Sprockets on ActionPackGuillermo Iguaran2012-03-1314-409/+0
| | | | | | |
| * | | | | | Remove sprockets integration on ActionPackGuillermo Iguaran2012-03-138-537/+0
| | | | | | |
| * | | | | | Merge pull request #572 from sikachu/remove_activeresourceJosé Valim2012-03-132-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove Active Resource source files from the repository.
| | * | | | | | Remove Active Resource source files from the repositoryPrem Sichanugrist2012-03-132-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dear Active Resource, It's not that I hate you or anything, but you didn't get much attention lately. There're so many alternatives out there, and I think people have made their choice to use them than you. I think it's time for you to have a big rest, peacefully in this Git repository. I will miss you, @sikachu.
| * | | | | | | add include_hidden option to checkbox tagSergey Nartimov2012-03-132-2/+13
| |/ / / / / /
| * | | | | / fix typo in AP CHANGELOG [ci skip]Vasiliy Ermolovich2012-03-131-1/+1
| | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-133-71/+165
| |\ \ \ \ \
| * | | | | | add 'include_hidden' option to select tag, closes #5402Vasiliy Ermolovich2012-03-134-1/+14
| | | | | | |
| * | | | | | 'module' is reserved word. Sample of code with error - not cool.Egor Homakov2012-03-131-2/+2
| | | | | | |
| * | | | | | Updated description of #retrieve_collector_from_mimesMark Thomson2012-03-131-2/+6
| | | | | | |
| * | | | | | Remove unused methodSantiago Pastorino2012-03-121-4/+0
| | | | | | |
| * | | | | | Merge pull request #5375 from nertzy/assert_template_with_regexpAaron Patterson2012-03-122-2/+13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | assert_template matches against Regexp
| | * | | | | | assert_template matches against RegexpGrant Hutchins2012-03-102-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows for more strict template assertions, while maintaining backward compatibility. For example, if you use assert_template("foo/bar") and "foo/bar/baz" was rendered, the test passes. But if you use assert_template(%r{\Afoo/bar\Z}), you will catch that a different template was rendered. Also, if you passed an unsupported argument to assert_template() in the past, it would silently succeed. Now it raises an ArgumentError.
| * | | | | | | Merge pull request #5380 from benmmurphy/escape_unicode_paragraph_separatorAaron Patterson2012-03-122-1/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | ensure u2029 is escaped in escape_javascript helper
| | * | | | | | | ensure u2029 is escaped in escape_javascript helperbenmmurphy2012-03-112-1/+5
| | | | | | | | |
| * | | | | | | | Merge pull request #5366 from parndt/fix_issue_5324José Valim2012-03-117-186/+185
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Fixes #5324 by removing default size options from input:text and default cols and rows options from textarea.
| | * | | | | | | Documented the removal of size from text_field based helpers and cols, rows ↵Philip Arndt2012-03-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from text_area helper.
| | * | | | | | | Fix unintended removal of 'cols' from a text_area example.Philip Arndt2012-03-121-1/+1
| | | | | | | | |