Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'master' into feature/public-fragment_name_with_digest | Ryan Garver | 2012-10-02 | 14 | -166/+202 | |
|\| | | ||||||
| * | | Failsafe exception returns text/plain. | Steve Klabnik | 2012-10-01 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | It's best to just return text/plain when something has gone terribly wrong. Fixes #5660. | |||||
| * | | Merge pull request #7708 from bdurand/optimize_log_subscribers | Rafael Mendonça França | 2012-10-01 | 2 | -8/+16 | |
| |\ \ | | | | | | | | | Optimize log subscribers to check if the log level is sufficient | |||||
| | * | | Optimize log subscribers to check if the log level is sufficient before ↵ | Brian Durand | 2012-09-30 | 2 | -8/+16 | |
| | | | | | | | | | | | | | | | | performing an operations. | |||||
| * | | | prefix TemplateAssertions ivars (#7459) | Yves Senn | 2012-10-01 | 2 | -23/+23 | |
| | | | | ||||||
| * | | | resource and resources do no longer modify passed options | Yves Senn | 2012-10-01 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | this is a patch for #7777. | |||||
| * | | | Whitespaces :scissors: [ci skip] | Rafael Mendonça França | 2012-09-30 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | `assert_template` no more passing with what ever string that matches. | Hugo Roque | 2012-09-29 | 1 | -5/+12 | |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given Im rendering an template `/layout/hello.html.erb`, assert_template was passing with any string that matches. This behavior allowed false passing like: assert_template "layout" assert_template "out/hello" Now the passing possibilities are: assert_template "layout/hello" assert_template "hello" fixing assert_template bug when template matches expected, but not ends with Cherry Pick Merge: Fixes issue #3849 assert_template false positive taking redundant test off prevening incorrect assert_template when rendering with repeated names in path updating CHANGELOG with bugfix: assert_template false passing | |||||
| * | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-09-28 | 8 | -119/+139 | |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb | |||||
| | * | | update image_tag output in examples to actual | Nihad Abbasov | 2012-09-25 | 1 | -4/+4 | |
| | | | | | | | | | | | | [ci-skip] | |||||
| | * | | update AC::ConditionalGet documentation [ci skip] | Francesco Rodriguez | 2012-09-22 | 1 | -27/+31 | |
| | | | | ||||||
| | * | | update AC::Caching documentation [ci skip] | Francesco Rodriguez | 2012-09-22 | 5 | -87/+103 | |
| | | | | ||||||
| | * | | remove AC::Parameters reference [ci skip] | Francesco Rodriguez | 2012-09-21 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | fix typos in AC::StrongParameters documentation [ci skip] | Francesco Rodriguez | 2012-09-21 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Fix tests broken by adding a new instance variable to view test cases | Jeremy Kemper | 2012-09-27 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Is not needed to wrap name inside an array here | Santiago Pastorino | 2012-09-27 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Change key not found to param not found | Santiago Pastorino | 2012-09-27 | 1 | -6/+6 | |
| | | | | ||||||
* | | | | Move the CacheHelper#fragment_name_with_digest to be public so custom ↵ | Ryan Garver | 2012-09-27 | 1 | -11/+11 | |
|/ / / | | | | | | | | | | fragment caching can benefit from it. | |||||
* | | | Also includes ConstantLookup dependency for controller and mailer tests | Andy Lindeman | 2012-09-26 | 1 | -0/+1 | |
| | | | ||||||
* | | | Adds missing dependency to ActionView::TestCase::Behavior | Andy Lindeman | 2012-09-26 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * The module is needed for the `determine_constant_from_test_name` method. * Without it, the including class is required to also include `ActiveSupport::Testing::ConstantLookup` or a `NoMethodError` will be raised upon instantiation of that class. * Issue introduced in c0a24555f9e2749fb94efe1967cb9943db0b6a7e | |||||
* | | | Merge pull request #7444 from szimek/params_parser_raises_parsing_error | Aaron Patterson | 2012-09-26 | 1 | -5/+12 | |
|\ \ \ | | | | | | | | | Raise generic ParseError exception when ParamsParser fails parsing request params | |||||
| * | | | Make ActionDispatch::ParamsParser::ParseError#original_exception return the ↵ | Szymon Nowak | 2012-08-27 | 1 | -4/+10 | |
| | | | | | | | | | | | | | | | | original exception. | |||||
| * | | | Fix ActionDispatch::ParamsParser::ParseError message for XML and JSON parsers. | Szymon Nowak | 2012-08-24 | 1 | -4/+2 | |
| | | | | ||||||
| * | | | Raise generic ParseError exception when ActionDispatch::ParamsParser fails ↵ | Szymon Nowak | 2012-08-24 | 1 | -2/+5 | |
| | | | | | | | | | | | | | | | | parsing request params. | |||||
* | | | | fixing most tests on Ruby 2.0 | Aaron Patterson | 2012-09-25 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | change ^ and $ anchors in regexp to \A and \z respectively | Nihad Abbasov | 2012-09-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | http://guides.rubyonrails.org/security.html#regular-expressions | |||||
* | | | | allow to pass numerical value to size option in image_tag | Nihad Abbasov | 2012-09-25 | 1 | -4/+5 | |
| | | | | | | | | | | | | | | | | | | | | This will set image's both width and height attributes to value passed in size option. | |||||
* | | | | Merge pull request #7749 from blowmage/minitest | Aaron Patterson | 2012-09-25 | 3 | -7/+15 | |
|\ \ \ \ | | | | | | | | | | | Improve support for minitest's spec DSL | |||||
| * | | | | Register AD::IntegrationTest for minitest's spec DSL | Mike Moore | 2012-09-24 | 1 | -0/+3 | |
| | | | | | ||||||
| * | | | | Support helper tests using spec DSL | Mike Moore | 2012-09-24 | 1 | -4/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Improve how helper tests to resolve the helper class from the test name. Add tests for helper tests using the minitest spec DSL. | |||||
| * | | | | Register helper and view tests for minitest's spec DSL | Mike Moore | 2012-09-24 | 1 | -0/+3 | |
| | | | | | ||||||
| * | | | | Allow strings in the controller test describe blocks | Mike Moore | 2012-09-24 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Allow controller tests using the spec DSL to match strings. Add test coverage for the register_spec_type calls. | |||||
| * | | | | Support controller tests using spec DSL - fixes #7743 | Mike Moore | 2012-09-24 | 1 | -3/+5 | |
| | | | | | | | | | | | | | | | | | | | | Add tests for controller tests using the minitest spec DSL. | |||||
* | | | | | depreacte unused Mime::Type#verify_request? and ↵ | grosser | 2012-09-24 | 1 | -1/+6 | |
|/ / / / | | | | | | | | | | | | | Mime::Type.browser_generated_types | |||||
* | | | | documents ActionDispatch::Http::UploadedFile | Xavier Noria | 2012-09-22 | 1 | -6/+55 | |
| | | | | ||||||
* | | | | Merge pull request #7713 from ↵ | Xavier Noria | 2012-09-22 | 1 | -6/+2 | |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | porras/action-dispatch-upload-delegates-close-to-tempfile Delegate ActionDispatch::Http::UploadedFile#close to tempfile | |||||
| * | | | Accept parameters in methods delegated to tempfile | Sergio Gil Pérez de la Manga | 2012-09-22 | 1 | -6/+2 | |
| | | | | ||||||
| * | | | Delegate ActionDispatch::Http::UploadedFile#close to tempfile | Sergio Gil Pérez de la Manga | 2012-09-20 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | fix typos and improve AC::StrongParameters documentation [ci skip] | Francesco Rodriguez | 2012-09-20 | 1 | -6/+8 | |
|/ / / | ||||||
* | | | update AC::StrongParameters documentation | Francesco Rodriguez | 2012-09-19 | 1 | -8/+53 | |
| | | | ||||||
* | | | define permitted? method instead of use an alias to fix rdoc | Francesco Rodriguez | 2012-09-19 | 1 | -2/+12 | |
| | | | ||||||
* | | | update AC::Parameters documentation [ci skip] | Francesco Rodriguez | 2012-09-19 | 1 | -1/+149 | |
| | | | ||||||
* | | | update AC::ParameterMissing documentation [ci skip] | Francesco Rodriguez | 2012-09-19 | 1 | -2/+9 | |
| | | | ||||||
* | | | update AC::ParamsWrapper documentation [ci skip] | Francesco Rodriguez | 2012-09-19 | 1 | -3/+4 | |
| |/ |/| | ||||||
* | | Set AC::Parameters.permit_all_parameters explicitly to false when ↵ | Guillermo Iguaran | 2012-09-19 | 1 | -1/+1 | |
| | | | | | | | | config.action_controller.permit_all_parameters is not present | |||||
* | | Removing to_shorthand from default_controller_and_action. Fixes #6497 | Luiz Felipe | 2012-09-19 | 1 | -1/+1 | |
| | | | | | | | | | | When using shortcut routes inside an engine the "to_shorthand" variable is set to true, causing the module scope of the route to not be applied. | |||||
* | | fix shadowing outer local variable warning | Sergey Nartimov | 2012-09-19 | 1 | -3/+3 | |
| | | ||||||
* | | Merge pull request #7251 from rails/integrate-strong_parameters | David Heinemeier Hansson | 2012-09-18 | 5 | -7/+134 | |
|\ \ | | | | | | | Integrate strong_parameters in Rails 4 | |||||
| * | | AC::ParameterMissing inherits from KeyError since it's more appropiated than ↵ | Guillermo Iguaran | 2012-09-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | IndexError | |||||
| * | | Support fields_for attributes, which may have numeric symbols as hash keys | Guillermo Iguaran | 2012-09-16 | 1 | -0/+4 | |
| | | |