Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | revises the documentation of String#truncate and the truncate helper | Xavier Noria | 2010-06-02 | 1 | -9/+9 |
| | |||||
* | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2010-06-01 | 1 | -0/+2 |
|\ | |||||
| * | Unforce builder from AS | Santiago Pastorino | 2010-06-01 | 1 | -0/+1 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Unforce tzinfo from AS | Santiago Pastorino | 2010-06-01 | 1 | -0/+1 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Extracted String#truncate from TextHelper#truncate [DHH] | David Heinemeier Hansson | 2010-06-01 | 1 | -11/+5 |
|/ | |||||
* | Base options cant live in lazy loaded helpers as they then wont be available ↵ | David Heinemeier Hansson | 2010-05-31 | 2 | -7/+4 |
| | | | | to set for config | ||||
* | Unforce i18n from AS | Santiago Pastorino | 2010-05-31 | 1 | -0/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | rack-test version updated and removed from Gemfile | Santiago Pastorino | 2010-05-31 | 1 | -1/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Add :only and :except to controllers MiddlewareStack. This allows | José Valim | 2010-05-30 | 3 | -18/+71 |
| | | | | | | | | you to do the following: class PostsController < ApplicationController use AutheMiddleware, :except => [:index, :show] end | ||||
* | Update template to allow handlers to more cleanly handle encodings (ht: nex3) | wycats | 2010-05-30 | 4 | -69/+78 |
| | |||||
* | Remove the laziness from the middleware stack. | José Valim | 2010-05-29 | 2 | -74/+17 |
| | |||||
* | Now that we always return a proxy from mb_chars, even in 1.9, all Strings ↵ | wycats | 2010-05-29 | 1 | -3/+5 |
| | | | | coming back from AS are UTF-8. | ||||
* | fix translation test in actionpack [#4701 state:commited] | Santiago Pastorino | 2010-05-29 | 1 | -1/+1 |
| | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
* | Removing Metal from Rails 3. | wycats | 2010-05-29 | 2 | -30/+0 |
| | | | | | | | | | | | | | | | | | | | | If you have existing Metals, you have a few options: * if your metal behaves like a middleware, add it to the middleware stack via config.middleware.use. You can use methods on the middleware stack to control exactly where it should go * if it behaves like a Rack endpoint, you can link to it in the router. This will result in more optimal routing time, and allows you to remove code in your endpoint that matches specific URLs in favor of the more powerful handling in the router itself. For the future, you can use ActionController::Metal to get a very fast controller with the ability to opt-in to specific controller features without paying the penalty of the full controller stack. Since Rails 3 is closer to Rack, the Metal abstraction is no longer needed. | ||||
* | Merge commit 'mislav/auto_link' | Michael Koziarski | 2010-05-29 | 2 | -30/+61 |
|\ | |||||
| * | avoid auto_linking already linked emails; more robust detection of linked URLs | Mislav Marohnić | 2010-05-24 | 2 | -16/+48 |
| | | | | | | | | | | | | | | | | | | | | 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-24 | 2 | -14/+13 |
| | | | | | | | | | | | | recognizes all URI scheme allowed characters, such as colon and period. [#3494 state:resolved] | ||||
* | | Merge remote branch 'rails/master' | Xavier Noria | 2010-05-27 | 15 | -233/+299 |
|\ \ | |||||
| * | | In AV::TC, move protect_against_forgery? from the test_case to the | David Chelimsky | 2010-05-26 | 2 | -4/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _helper module included in the view. - ensures that protect_against_forgery? is present when a helper included in a partial that is rendered by the template under test calls it (which happens in FormTagHelper#extra_tags_for_form, for example). [#4700 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | reorganize tests for AV::TC | David Chelimsky | 2010-05-26 | 1 | -140/+138 |
| | | | | | | | | | | | | | | | | | | | | | | | | - decouple tests from the test case class by moving them outside - split out more TestCase subs as cleaner way of avoiding bleed of class level concepts Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | Support configuration of controller.controller_path on instances of | David Chelimsky | 2010-05-26 | 2 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionView::TestCase::TestController without stubs. Just say: @controller.controller_path = "path/i/need/for/this/test" [#4697 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | i18n: t() handles single keys returning an Array, also | Jeremy Kemper | 2010-05-24 | 2 | -2/+15 |
| | | | |||||
| * | | HTML safety: fix textarea with nil content | Jeremy Kemper | 2010-05-24 | 2 | -1/+7 |
| | | | |||||
| * | | translate method doesn't support arrays anymore and is optimized to be used ↵ | Santiago Pastorino | 2010-05-24 | 5 | -34/+13 |
| | | | | | | | | | | | | | | | | | | with strings or symbols Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | Revert "translation method for arrays on TranslationHelper module returns an ↵ | Santiago Pastorino | 2010-05-24 | 4 | -42/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | array where values for keys of the form (.|_)html keys are html_safe" This reverts commit 05c95b5c5815c0b3ae55fda7a897922b7f3ec2c7. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | Move AV::TC to AV::TC::Behavior [#4678 state:resolved] | David Chelimsky | 2010-05-24 | 2 | -65/+99 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - enables alternative testing frameworks to include AV::TC::Behavior instead of subclassing AV::TC - also added tests and code for: - test view delegates :notice to request.flash - useful since generators generate views that use notice - test case doesn't try to include modules that are actually classes Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | translation method for arrays on TranslationHelper module returns an array ↵ | Santiago Pastorino | 2010-05-24 | 4 | -41/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | where values for keys of the form (.|_)html keys are html_safe [#4675] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | Fix a bug where responders were not working properly on method override. | José Valim | 2010-05-24 | 2 | -1/+14 |
| |/ | |||||
| * | refactor evals and adds some __FILE__ and __LINE__ | Santiago Pastorino | 2010-05-20 | 5 | -11/+9 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | fix small doc bug about running single unit test files | David Chelimsky | 2010-05-25 | 1 | -1/+1 |
| | | |||||
* | | 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 | 40 | -462/+711 |
|\ | |||||
| * | Avoid instance variable @output_buffer not initialized | Santiago Pastorino | 2010-05-19 | 1 | -1/+2 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Use better assertion methods for testing | Neeraj Singh | 2010-05-19 | 2 | -9/+9 |
| | | | | | | | | | | | | [#4645 state:resolved] 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 | 7 | -133/+71 |
| | | | | | | | | set_session semantics to return the cookie value instead of a boolean. | ||||
| * | Use assert_respond_to because it has better error messaging | Neeraj Singh | 2010-05-18 | 3 | -8/+8 |
| | | | | | | | | | | | | [#4628 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Remove deprecated methods since 2-3-stable. | José Valim | 2010-05-18 | 2 | -46/+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 | 6 | -142/+130 |
| | | |||||
| * | Rely on set and delete cookie logic from rack. | José Valim | 2010-05-18 | 2 | -33/+6 |
| | | |||||
| * | Merge remote branch 'origin/master' | wycats | 2010-05-17 | 4 | -3/+38 |
| |\ | |||||
| | * | Added default currency values to NumberHelper and pass them to I18n.translate | Santiago Pastorino | 2010-05-17 | 2 | -2/+22 |
| | | | | | | | | | | | | | | | | | | [#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 | 2 | -1/+16 |
| | | | | | | | | | | | | collection. | ||||
| * | | Merge branch 'encodings' | wycats | 2010-05-17 | 2 | -5/+9 |
| |\ \ | |||||
| | * | | Make sure encoding changes don't break 1.8 | wycats | 2010-05-17 | 2 | -5/+9 |
| | | | | |||||
| * | | | Revert "Moved encoding work in progress to a feature branch." | wycats | 2010-05-17 | 15 | -87/+435 |
| | |/ | |/| | | | | | | | 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 | 25 | -85/+365 |
|\| | |