aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* revises the documentation of String#truncate and the truncate helperXavier Noria2010-06-022-22/+18
|
* Add lib to load paths when application is inherited to be able to load lib ↵José Valim2010-06-023-1/+29
| | | | code during configuration.
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2010-06-0114-21/+44
|\
| * revises rdoc of AMo::Error#add [#4738 state:resolved]Xavier Noria2010-06-011-6/+6
| |
| * Unforce text-format from AMSantiago Pastorino2010-06-014-7/+10
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Unforce memcache from ASSantiago Pastorino2010-06-013-3/+9
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Unforce builder from ASSantiago Pastorino2010-06-016-3/+10
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Unforce tzinfo from ASSantiago Pastorino2010-06-014-2/+9
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Extracted String#truncate from TextHelper#truncate [DHH]David Heinemeier Hansson2010-06-014-11/+69
|/
* Base options cant live in lazy loaded helpers as they then wont be available ↵David Heinemeier Hansson2010-05-312-7/+4
| | | | to set for config
* Unforce i18n from ASSantiago Pastorino2010-05-316-6/+19
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* rack-test version updated and removed from GemfileSantiago Pastorino2010-05-312-2/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Add :only and :except to controllers MiddlewareStack. This allowsJosé Valim2010-05-303-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)wycats2010-05-304-69/+78
|
* Remove the laziness from the middleware stack.José Valim2010-05-299-106/+51
|
* Now that we always return a proxy from mb_chars, even in 1.9, all Strings ↵wycats2010-05-291-3/+5
| | | | coming back from AS are UTF-8.
* fix translation test in actionpack [#4701 state:commited]Santiago Pastorino2010-05-291-1/+1
| | | | Signed-off-by: wycats <wycats@gmail.com>
* Removing Metal from Rails 3. wycats2010-05-2920-319/+9
| | | | | | | | | | | | | | | | | | | | 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/counter_cache'Michael Koziarski2010-05-293-63/+95
|\
| * fix `reset_counters` to work even with complex class namesMislav Marohnić2010-05-242-4/+31
| | | | | | | | | | | | e.g. it guesses that a belongs_to association to Namespace::MyModel is named "my_model", unlike before where it would look up an association named "namespace::mymodel" and fail.
| * move counter_cache tests to a separate file and refactorMislav Marohnić2010-05-242-49/+58
| |
| * cleanup `update/reset_counters`: less SQL strings, more ActiveRecord/ArelMislav Marohnić2010-05-241-12/+8
| |
* | Merge commit 'mislav/auto_link'Michael Koziarski2010-05-292-30/+61
|\ \
| * | avoid auto_linking already linked emails; more robust detection of linked URLsMislav Marohnić2010-05-242-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-242-14/+13
| |/ | | | | | | | | | | recognizes all URI scheme allowed characters, such as colon and period. [#3494 state:resolved]
* | performance and integration tests inherit from AD, not ACGonçalo Silva2010-05-282-2/+2
| | | | | | | | Signed-off-by: wycats <wycats@gmail.com>
* | Use I18n 0.4.0José Valim2010-05-271-1/+1
| |
* | Merge remote branch 'rails/master'Xavier Noria2010-05-2754-1020/+1120
|\ \
| * | In AV::TC, move protect_against_forgery? from the test_case to theDavid Chelimsky2010-05-262-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::TCDavid Chelimsky2010-05-261-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>
| * | Adding to_key to ActiveResource objects using ActiveModel::Conversion [#4685 ↵Elomar França2010-05-262-5/+8
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * | Support configuration of controller.controller_path on instances ofDavid Chelimsky2010-05-262-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>
| * | get railties/README back to the home page of the APIXavier Noria2010-05-251-0/+1
| | |
| * | Fix test incorrectly using a bare assert to use assert_kind_ofSantiago Pastorino2010-05-241-1/+1
| | | | | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * | Refactor calculation test to remove unneeded SQLite special case.Santiago Pastorino2010-05-241-4/+1
| | | | | | | | | | | | | | | | | | [#4633] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * | i18n: t() handles single keys returning an Array, alsoJeremy Kemper2010-05-242-2/+15
| | |
| * | HTML safety: fix textarea with nil contentJeremy Kemper2010-05-242-1/+7
| | |
| * | translate method doesn't support arrays anymore and is optimized to be used ↵Santiago Pastorino2010-05-245-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 Pastorino2010-05-244-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 Chelimsky2010-05-242-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 Pastorino2010-05-244-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é Valim2010-05-242-1/+14
| |/
| * Missing changelog headingJeremy Kemper2010-05-232-0/+8
| |
| * Fix a bug where I18n fallbacks modules where not included in the proper ↵José Valim2010-05-232-9/+13
| | | | | | | | backend if it was set through config.i18n.backend.
| * Use multibyte proxy class on 1.9, refactor Unicode.Norman Clarke2010-05-2113-701/+715
| | | | | | | | | | | | | | | | | | | | Makes String#mb_chars on Ruby 1.9 return an instance of ActiveSupport::Multibyte::Chars to work around 1.9's lack of Unicode case folding. Refactors class methods from ActiveSupport::Multibyte::Chars into new Unicode module, adding other related functionality for consistency. [#4594 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fix failing test.José Valim2010-05-212-9/+9
| |
| * 1.day should respond_to kind_of tooNeeraj Singh2010-05-212-0/+2
| | | | | | | | | | | | [#4656 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Replace assert with assert_equal in some test casesNeeraj Singh2010-05-212-5/+5
| | | | | | | | | | | | [#4654 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Fix typo on rackup test (ht: pleax)José Valim2010-05-201-1/+1
| |
| * More accurate JRuby gem requirementsNick Sieger2010-05-201-5/+15
| | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> Signed-off-by: José Valim <jose.valim@gmail.com>