aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* avoid auto_linking already linked emails; more robust detection of linked URLsMislav Marohnić2010-05-241-9/+18
| | | | | | | | | | References #1523 [#1862 state:resolved] [#3591 state:resolved] Add test that shows how link text can contain HTML if needed: the trick is using block form in combination with `raw`. Let link text be automatically HTML-escaped [#2017 state:resolved]
* auto_link: support arbitrary URI schemes like "ftp:" and "file:"Mislav Marohnić2010-05-241-3/+3
| | | | | | recognizes all URI scheme allowed characters, such as colon and period. [#3494 state:resolved]
* refactor evals and adds some __FILE__ and __LINE__Santiago Pastorino2010-05-204-8/+7
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge remote branch 'rails/master'Xavier Noria2010-05-1915-367/+414
|\
| * Avoid instance variable @output_buffer not initializedSantiago Pastorino2010-05-191-1/+2
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Avoid creating a Rack::Response object in the cookie middleware since it may ↵José Valim2010-05-181-9/+13
| | | | | | | | stream the body.
| * Cut the fat and make session stores rely on request.cookie_jar and change ↵José Valim2010-05-183-130/+55
| | | | | | | | set_session semantics to return the cookie value instead of a boolean.
| * Remove deprecated methods since 2-3-stable.José Valim2010-05-181-34/+6
| |
| * Kill legacy dispatcher.José Valim2010-05-181-2/+0
| |
| * Simplify cookie_store by simply relying on cookies.signed.José Valim2010-05-182-94/+45
| |
| * Rely on set and delete cookie logic from rack.José Valim2010-05-181-33/+2
| |
| * Merge remote branch 'origin/master'wycats2010-05-172-2/+10
| |\
| | * Added default currency values to NumberHelper and pass them to I18n.translateSantiago Pastorino2010-05-171-2/+5
| | | | | | | | | | | | | | | | | | [#4604 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
| | * Allow root to be given in the resources scope without need to specify :on => ↵José Valim2010-05-171-0/+5
| | | | | | | | | | | | collection.
| * | Merge branch 'encodings'wycats2010-05-171-1/+3
| |\ \
| | * | Make sure encoding changes don't break 1.8wycats2010-05-171-1/+3
| | | |
| * | | Revert "Moved encoding work in progress to a feature branch."wycats2010-05-175-72/+289
| | |/ | |/| | | | | | | This reverts commit ade756fe42423033bae8e5aea8f58782f7a6c517.
| * | Ruby 1.9: helper path may be a pathname, so convert to a string before ↵Jeremy Kemper2010-05-161-1/+1
| | | | | | | | | | | | quoting for regexp
* | | fix documentation typoMarius Nuennerich2010-05-181-2/+2
| | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | | Merge branch 'master' of git://github.com/rails/railsRizwan Reza2010-05-1711-52/+122
|\| |
| * | Moved encoding work in progress to a feature branch.Jeremy Kemper2010-05-165-289/+72
| |/ | | | | | | This reverts commits af0d1a88157942c6e6398dbf73891cff1e152405 and 64d109e3539ad600f58536d3ecabd2f87b67fd1c.
| * Significantly improved internal encoding heuristics and support.wycats2010-05-165-37/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Default Encoding.default_internal to UTF-8 * Eliminated the use of file-wide magic comments to coerce code evaluated inside the file * Read templates as BINARY, use default_external or template-wide magic comments inside the Template to set the initial encoding * This means that template handlers in Ruby 1.9 will receive Strings encoded in default_internal (UTF-8 by default) * Create a better Exception for encoding issues, and use it when the template source has bytes that are not compatible with the specified encoding * Allow template handlers to opt-into handling BINARY. If they do so, they need to do some of their own manual encoding work * Added a "Configuration Gotchas" section to the intro Rails Guide instructing users to use UTF-8 for everything * Use config.encoding= in Ruby 1.8, and raise if a value that is an invalid $KCODE value is used Also: * Fixed a few tests that were assert() rather than assert_equal() and were caught by Minitest requiring a String for the message * Fixed a test where an assert_select was misformed, also caught by Minitest being more restrictive * Fixed a test where a Rack response was returning a String rather than an Enumerable
| * Initial work to improve the state of encodings for templateswycats2010-05-163-45/+61
| |
| * Check blocks are not incorrectly detected when compiling erubis templates ↵Simon Jefford2010-05-161-1/+1
| | | | | | | | | | | | [#4575 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * added support for html attributes in options_for_select [#2165]pleax2010-05-161-2/+25
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Sending :id => nil to form helpers now properly omits the "id" html element ↵Jeff Dean2010-05-151-5/+11
| | | | | | | | | | | | [#4559 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Optimize the code added in fa99de0bd054576336c9José Valim2010-05-151-9/+19
| |
| * make sure `as` is set before trying to build an #{as}_counter. [#2804 ↵Jeff Kreeftmeijer2010-05-151-1/+1
| | | | | | | | | | | | state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * partial counters with :as [#2804 state:resolved]Jeff Kreeftmeijer2010-05-151-0/+1
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * added convenience methods #notice and #alert to flash.nowMartin2010-05-151-0/+10
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * fix assert_select messages to its declaration behaviourPaco Guzman2010-05-151-5/+11
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Accept :alt => nil on image_tag [#4558 state:resolved]Marc-Andre Lafortune2010-05-151-1/+1
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Improve previous patch a bit [#3645 state:resolved]José Valim2010-05-152-9/+6
| |
| * Let label helpers accept blocks.Stephen Celis2010-05-152-18/+40
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * corrected error message in session/cookie_store [#4546 state:resolved]Josh Kalderimis2010-05-101-1/+1
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Use annoted source code in Template:Error to avoid special cases in the show ↵José Valim2010-05-092-11/+6
| | | | | | | | exceptions middleware.
* | Added extra documentation for content_for helperJeroen van Dijk2010-05-151-6/+25
|/
* Fix parsing xml input by ActionDispatch::ParamsParserLawrence Pit2010-05-061-1/+1
| | | | | | [#4437 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Eliminate false positives when passing symbols to assert_templateDavid Chelimsky2010-05-031-1/+2
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Favor %{} in all code instead of (deprecated) {{}} as interpolation syntax ↵Lawrence Pit2010-05-031-1/+1
| | | | | | for I18n Signed-off-by: José Valim <jose.valim@gmail.com>
* Make backtrace_cleaner work as expected. Prior to this patch, the Full Trace ↵José Valim2010-05-031-26/+6
| | | | rarely showed the full trace. Also, increase performance considerably.
* add NullResolverDavid Chelimsky2010-05-021-0/+8
| | | | | | [#4523 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* move FixtureResolver to a file that is accessible outside Rails' own testsDavid Chelimsky2010-05-021-0/+35
| | | | | | [#4522 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Change event namespace ordering to most-significant first [#4504 state:resolved]Justin George2010-05-027-15/+15
| | | | | | | | | More work still needs to be done on some of these names (render_template.action_view and render_template!.action_view particularly) but this allows (for example) /^sql/ to subscribe to all the various ORMs without further modification Signed-off-by: José Valim <jose.valim@gmail.com>
* Speed up I18n helpers in views and add entry to CHANGELOG.José Valim2010-05-011-7/+3
|
* Use %{} syntax in I18n (faster) instead of {{}}.José Valim2010-05-012-17/+17
|
* RouteSet does not raise ActionController::RoutingError when no routes match ↵Carl Lerche2010-04-302-6/+11
| | | | anymore. Instead, it follows the X-Cascade convention. ShowExceptions checks for X-Cascade so that the routing error page can still be displayed.
* Merge remote branch 'technoweenie/http_token_authentication'Jeremy Kemper2010-04-302-0/+159
|\ | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * add HTTP Token Authorization support to complement Basic and Digest ↵rick2010-04-302-0/+159
| | | | | | | | Authorization.
* | Merge branch 'master' of github.com:rails/railswycats2010-04-304-48/+37
|\|