Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | refactor evals and adds some __FILE__ and __LINE__ | Santiago Pastorino | 2010-05-20 | 4 | -8/+7 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | Minor typo fix in callbacks.rb of abstract_controller | Rohit Arondekar | 2010-05-20 | 1 | -1/+1 | |
|/ | ||||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-05-19 | 15 | -367/+414 | |
|\ | ||||||
| * | Avoid instance variable @output_buffer not initialized | Santiago Pastorino | 2010-05-19 | 1 | -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é Valim | 2010-05-18 | 1 | -9/+13 | |
| | | | | | | | | stream the body. | |||||
| * | Cut the fat and make session stores rely on request.cookie_jar and change ↵ | José Valim | 2010-05-18 | 3 | -130/+55 | |
| | | | | | | | | set_session semantics to return the cookie value instead of a boolean. | |||||
| * | Remove deprecated methods since 2-3-stable. | José Valim | 2010-05-18 | 1 | -34/+6 | |
| | | ||||||
| * | Kill legacy dispatcher. | José Valim | 2010-05-18 | 1 | -2/+0 | |
| | | ||||||
| * | Simplify cookie_store by simply relying on cookies.signed. | José Valim | 2010-05-18 | 2 | -94/+45 | |
| | | ||||||
| * | Rely on set and delete cookie logic from rack. | José Valim | 2010-05-18 | 1 | -33/+2 | |
| | | ||||||
| * | Merge remote branch 'origin/master' | wycats | 2010-05-17 | 2 | -2/+10 | |
| |\ | ||||||
| | * | Added default currency values to NumberHelper and pass them to I18n.translate | Santiago Pastorino | 2010-05-17 | 1 | -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é Valim | 2010-05-17 | 1 | -0/+5 | |
| | | | | | | | | | | | | collection. | |||||
| * | | Merge branch 'encodings' | wycats | 2010-05-17 | 1 | -1/+3 | |
| |\ \ | ||||||
| | * | | Make sure encoding changes don't break 1.8 | wycats | 2010-05-17 | 1 | -1/+3 | |
| | | | | ||||||
| * | | | Revert "Moved encoding work in progress to a feature branch." | wycats | 2010-05-17 | 5 | -72/+289 | |
| | |/ | |/| | | | | | | | This reverts commit ade756fe42423033bae8e5aea8f58782f7a6c517. | |||||
| * | | Ruby 1.9: helper path may be a pathname, so convert to a string before ↵ | Jeremy Kemper | 2010-05-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | quoting for regexp | |||||
* | | | fix documentation typo | Marius Nuennerich | 2010-05-18 | 1 | -2/+2 | |
| | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | | | Merge branch 'master' of git://github.com/rails/rails | Rizwan Reza | 2010-05-17 | 11 | -52/+122 | |
|\| | | ||||||
| * | | Moved encoding work in progress to a feature branch. | Jeremy Kemper | 2010-05-16 | 5 | -289/+72 | |
| |/ | | | | | | | This reverts commits af0d1a88157942c6e6398dbf73891cff1e152405 and 64d109e3539ad600f58536d3ecabd2f87b67fd1c. | |||||
| * | Significantly improved internal encoding heuristics and support. | wycats | 2010-05-16 | 5 | -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 templates | wycats | 2010-05-16 | 3 | -45/+61 | |
| | | ||||||
| * | Check blocks are not incorrectly detected when compiling erubis templates ↵ | Simon Jefford | 2010-05-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | [#4575 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | added support for html attributes in options_for_select [#2165] | pleax | 2010-05-16 | 1 | -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 Dean | 2010-05-15 | 1 | -5/+11 | |
| | | | | | | | | | | | | [#4559 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Optimize the code added in fa99de0bd054576336c9 | José Valim | 2010-05-15 | 1 | -9/+19 | |
| | | ||||||
| * | make sure `as` is set before trying to build an #{as}_counter. [#2804 ↵ | Jeff Kreeftmeijer | 2010-05-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | partial counters with :as [#2804 state:resolved] | Jeff Kreeftmeijer | 2010-05-15 | 1 | -0/+1 | |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | added convenience methods #notice and #alert to flash.now | Martin | 2010-05-15 | 1 | -0/+10 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | fix assert_select messages to its declaration behaviour | Paco Guzman | 2010-05-15 | 1 | -5/+11 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Accept :alt => nil on image_tag [#4558 state:resolved] | Marc-Andre Lafortune | 2010-05-15 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | Improve previous patch a bit [#3645 state:resolved] | José Valim | 2010-05-15 | 2 | -9/+6 | |
| | | ||||||
| * | Let label helpers accept blocks. | Stephen Celis | 2010-05-15 | 2 | -18/+40 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | corrected error message in session/cookie_store [#4546 state:resolved] | Josh Kalderimis | 2010-05-10 | 1 | -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é Valim | 2010-05-09 | 2 | -11/+6 | |
| | | | | | | | | exceptions middleware. | |||||
* | | Added extra documentation for content_for helper | Jeroen van Dijk | 2010-05-15 | 1 | -6/+25 | |
|/ | ||||||
* | Fix parsing xml input by ActionDispatch::ParamsParser | Lawrence Pit | 2010-05-06 | 1 | -1/+1 | |
| | | | | | | [#4437 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
* | Eliminate false positives when passing symbols to assert_template | David Chelimsky | 2010-05-03 | 1 | -1/+2 | |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Favor %{} in all code instead of (deprecated) {{}} as interpolation syntax ↵ | Lawrence Pit | 2010-05-03 | 1 | -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é Valim | 2010-05-03 | 1 | -26/+6 | |
| | | | | rarely showed the full trace. Also, increase performance considerably. | |||||
* | add NullResolver | David Chelimsky | 2010-05-02 | 1 | -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 tests | David Chelimsky | 2010-05-02 | 1 | -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 George | 2010-05-02 | 7 | -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é Valim | 2010-05-01 | 1 | -7/+3 | |
| | ||||||
* | Use %{} syntax in I18n (faster) instead of {{}}. | José Valim | 2010-05-01 | 2 | -17/+17 | |
| | ||||||
* | RouteSet does not raise ActionController::RoutingError when no routes match ↵ | Carl Lerche | 2010-04-30 | 2 | -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 Kemper | 2010-04-30 | 2 | -0/+159 | |
|\ | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | add HTTP Token Authorization support to complement Basic and Digest ↵ | rick | 2010-04-30 | 2 | -0/+159 | |
| | | | | | | | | Authorization. | |||||
* | | Merge branch 'master' of github.com:rails/rails | wycats | 2010-04-30 | 4 | -48/+37 | |
|\| | ||||||
| * | removing the extra assignment statement [#4432 state:resolved] | Neeraj Singh | 2010-04-30 | 1 | -1/+0 | |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> |