aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
Commit message (Collapse)AuthorAgeFilesLines
* Avoid changing the global state on the testsRafael Mendonça França2015-01-051-1/+6
|
* Merge pull request #17676 from ↵Rafael Mendonça França2015-01-052-6/+27
|\ | | | | | | | | | | tigrish/fix_custom_i18n_exception_handler_regression Fix I18n regression introduced by #13832
| * Fix I18n regression introduced by #13832Christopher Dell2014-11-192-6/+27
| | | | | | | | Previously, when the `:raise` options was set to `false`, it would get overwritten to `true`, preventing custom exception handlers to be used.
* | Merge pull request #18328 from brainopia/remove_tz_proxyRafael Mendonça França2015-01-041-1/+1
|\ \ | | | | | | Use directly TZInfo::Timezone without proxy
| * | Use directly TZInfo::Timezone without proxybrainopia2015-01-041-1/+1
| | | | | | | | | | | | | | | Since real timezone is loaded anyway in `#utc_offset` which is called during `#create`
* | | Remove wrong TODO commentRafael Mendonça França2015-01-041-1/+1
| | |
* | | Remove version conditional for find_template_pathsRafael Mendonça França2015-01-041-18/+6
|/ / | | | | | | | | Now that we only support Ruby 2.2+ we don't need this conditional anymore
* | Remove unneeded `require 'as/deprecation'`claudiob2015-01-041-1/+0
| | | | | | | | | | Tests should still pass after removing `require 'active_support/deprecation'` from these files since the related deprecations have been removed.
* | Remove unneeded requiresRafael Mendonça França2015-01-041-1/+0
| | | | | | | | These requires were added only to change deprecation message
* | Change the default template handler from `ERB` to `Raw`.Rafael Mendonça França2015-01-043-8/+9
| | | | | | | | | | Files without a template handler in their extension will be rended using the raw handler instead of ERB.
* | Remove deprecated `AbstractController::Base::parent_prefixes`Rafael Mendonça França2015-01-043-35/+7
| |
* | Fix a few typos [ci skip]Robin Dupret2015-01-031-1/+1
| |
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-01-031-5/+5
|\ \
| * | Fix "Rendering" not to link to AV::Renderingclaudiob2014-12-251-5/+5
| | | | | | | | | | | | | | | | | | | | | The "Rendering" word in the titles is not meant to be a link to the documentation for ActionView::Rendering. [ci skip]
* | | Unsafe default translations should not be marked html_safeJustin Coyne2015-01-023-19/+20
| | | | | | | | | | | | | | | | | | Previously default translation keys that didn't end in `_html`, but came after a missing key that ended in `_html` were being returned as html_safe. Now they are not. Fixes #18257
* | | Follow up to #17973 [ci skip]Robin Dupret2015-01-021-9/+10
| | |
* | | Merge pull request #17974 from killthekitten/fix-render-blockRafael Mendonça França2015-01-024-1/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make possible to use blocks with short version of render partial Conflicts: actionview/CHANGELOG.md
| * | | Make possible to use blocks with short version of render partialNikolay Shebanov2014-12-194-1/+13
| |/ /
* | | Merge pull request #17973 from maurogeorge/file_field_hidden_fieldRafael Mendonça França2015-01-024-5/+58
|\ \ \ | | | | | | | | | | | | Generate a hidden_tag when using a file_field
| * | | Add a hidden_field on the file_fieldMauro George2015-01-024-5/+56
|/ / / | | | | | | | | | | | | This will avoid a error be raised when the only input on the form is the `file_field`.
* | | Merge pull request #18271 from arunagw/change-copyright-yearRobin Dupret2015-01-012-2/+2
|\ \ \ | | | | | | | | Update copyright notices to 2015 [ci skip]
| * | | Update copyright notices to 2015 [ci skip]Arun Agrawal2014-12-312-2/+2
| | | |
* | | | Changelog edits [ci skip]Robin Dupret2014-12-311-2/+2
|/ / /
* | | Fixes simple missprint in docs for #cyle in text_helperBen Woodall2014-12-301-1/+1
| | |
* | | Tiny documentation fixes [ci skip]Robin Dupret2014-12-301-3/+4
| | |
* | | Merge pull request #18130 from claudiob/better-record-identifier-docRobin Dupret2014-12-301-18/+42
|\ \ \ | | | | | | | | Better docs for AV::RecordIdentifier [ci skip]
| * | | Better docs for AV::RecordIdentifierclaudiob2014-12-231-18/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit intends to clarify the scope of ActionView::RecordIdentifier methods `dom_id` and `dom_class`. Most of the current documentation comes from da257eb8 (7 years ago) when the decoupling of ActionView, ActiveRecord and ActiveModel was not a concern. Since then, steps have been taken to reach such decoupling, especially 8ca17926 which duplicated ActionController::ModelNaming into ActionView::ModelNaming explaining that: > These are just a simple helpers for decoupling Active Model, so it does not > make sense to extract it to Active Support, but the point is to decouple also > Action View and Action Pack As of today, ActionView::RecordIdentifier only includes `dom_id` and `dom_class` so it makes sense to explicitly document those two methods, and leaving the details of helpers like `div_for` in the corresponding files. Moreover, I think it's important to mention in the documentation that ActionView::RecordIdentifier **does not strictly depend on the ActiveRecord API**: any class `Post` implementing `post.to_key` and `post.model_name.param_key` will work. [ci skip]
* | | | Merge pull request #18251 from tjgrathwell/fix-polymorphic-routes-to-modelRafael Mendonça França2014-12-301-5/+15
|\ \ \ \ | | | | | | | | | | | | | | | Fix form_for to work with objects that implement to_model
| * | | | Fix form_for to work with objects that implement to_modelTravis Grathwell2014-12-291-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if you tried to use form_for with a presenter object that implements to_model, it would crash in action_dispatch/routing/polymorphic_routes.rb when asking the presenter whether it is .persisted? Now, we always ask .persisted? of the to_model object instead. This seems to been an issue since 1606fc9d840da869a60213bc889da6fcf1fdc431 Signed-off-by: Eugenia Dellapenna <eugenia.dellapenna@gmail.com>
* | | | | Template lookup now respect default locale and I18n fallbacks.Rafael Mendonça França2014-12-291-8/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given the following templates: mailer/demo.html.erb mailer/demo.en.html.erb mailer/demo.pt.html.erb Before this change for a locale that doesn't have its related file the `mailer/demo.html.erb` will be rendered even if `en` is the default locale. Now `mailer/demo.en.html.erb` has precedence over the file without locale. Also, it is possible to give a fallback. mailer/demo.pt.html.erb mailer/demo.pt-BR.html.erb So if the locale is `pt-PT`, `mailer/demo.pt.html.erb` will be rendered given the right I18n fallback configuration. Fixes #11884.
* | | | fix error message of option as with invalid charters in partial renderingAngelo capilleri2014-12-293-5/+32
| | | | | | | | | | | | | | | | | | | | before this PR IDENTIFIER_ERROR_MESSAGE could lead to misunderstand the convention of partial name. Added OPTION_AS_ERROR_MESSAGE for unvalid charter in as option.
* | | | Require Ruby 2.2 for Rails 5.0claudiob2014-12-261-1/+1
| | | | | | | | | | | | | | | | | | | | Stems from [this comment](https://github.com/rails/rails/pull/18203#issuecomment-68138096) by @robin850 and by the blog post http://weblog.rubyonrails.org/2014/12/19/Rails-4-2-final
* | | | Merge pull request #18107 from mkdynamic/add-reply-to-mail-toSean Griffin2014-12-242-4/+5
|\ \ \ \ | | | | | | | | | | Add support for Reply-To field in mail_to helper
| * | | | Add support for Reply-To field in mail_to helperMark Dodwell2014-12-202-4/+5
| | |/ / | |/| |
* | | | Merge pull request #18166 from merongivian/search_field_refactorSean Griffin2014-12-232-10/+12
|\ \ \ \ | | | | | | | | | | Remove block from super
| * | | | Remove block from superJose Añasco2014-12-232-10/+12
| |/ / /
* | / / Better tests for AV::RecordIdentifierclaudiob2014-12-232-0/+55
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit intends to clarify the scope of ActionView::RecordIdentifier methods `dom_id` and `dom_class`. Most of the current documentation comes from da257eb8 (7 years ago) when the decoupling of ActionView, ActiveRecord and ActiveModel was not a concern. Since then, steps have been taken to reach such decoupling. Therefore I think it's important to show that ActionView::RecordIdentifier **does not strictly depend on the ActiveRecord API**: any class `Post` implementing `post.to_key` and `post.model_name.param_key` will work. This commit adds a test to prove that ActionView::RecordIdentifier methods can also be used on objects that do not subclass ActiveRecord::Base.
* | | Remove unused Sheep fixture from AVclaudiob2014-12-222-14/+0
|/ / | | | | | | | | | | | | | | The `Sheep` fixture was added in eb23754e when moving template tests from actionpack to actionview, but it's not actually used in ActionView tests. The `Sheep` fixture is only used to test `uncountable` in ActiveModel tests, and is already defined in activemodel/test/models/sheep.rb
* | [ci skip] Fix HTML format on commentyui-knk2014-12-181-1/+2
| |
* | Test to ensure content_tag works when fixing #17661Jon Atack2014-12-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After c2fe093, which was reverted yesterday, there will likely be future PRs to address #17661. The test `actionview/test/template/capture_helper_test.rb #test_capture_returns_nil_if_the_returned_value_is_not_a_string` should have errored with c2fe093, but it was rewritten in the PR to not raise. My guess is that it may have seemed irrelevant to the content_tag tests or already covered by them. This test provides additional protection by being in the content_tag test suite to explicitly raise a red flag in future cases. It foregoes some redundancy for safety — at least until #17661 is closed.
* | Regression test for #18024Santiago Pastorino2014-12-151-0/+5
| |
* | Revert "Re-enable capture'ing non-String values"Santiago Pastorino2014-12-154-15/+3
| | | | | | | | This reverts commit c2fe0938d7201d4ce0bb2f25e72bf5f70df128af.
* | Re-enable capture'ing non-String valuesCarsten Zimmermann2014-12-144-3/+15
| | | | | | | | | | | | | | This has been discussed in #17661 and partially reverts the changes made in 9de83050d3a4b260d4aeb5d09ec4eb64f913ba64 and 986cac73e3c56b3dfa22fd1464f6913e38d32cc3 The test case added to content_for acts as a regression / acceptance test.
* | Fix options overwritten by superJose Añasco2014-12-093-11/+15
| |
* | Merge pull request #17878 from claudiob/remove-unused-modgreet-fixtureYves Senn2014-12-021-1/+0
|\ \ | | | | | | Remove unused AV/test/fixtures/scope
| * | Remove unused AV/test/fixtures/scopeclaudiob2014-12-011-1/+0
| | | | | | | | | | | | | | | The file `modgreet.erb` was added 8 years ago in 21187c0 and is not used anymore by any test.
* | | Remove unused AV/test/fixtures/happy_pathclaudiob2014-12-011-1/+0
|/ / | | | | | | | | | | | | | | | | | | The `test/fixtures/happy_path/render_action/hello_world.erb` file was introduced in 8ab37c7 for the `TestRenderAction` test. That test was subsequently removed in 34f058e, so the fixture is not used anymore. If Travis CI is happy, then you can be sure the fixture can be removed.
* | Merge pull request #17871 from claudiob/remove-unused-blog-public-fixturesSantiago Pastorino2014-12-024-4/+0
|\ \ | | | | | | Remove unused AV/test/fixtures/blog_public
| * | Remove unused AV/test/fixtures/blog_publicclaudiob2014-12-014-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | The fixtures were added to support StaticTests in 401cd97 but those tests were then removed in d5ad92ce. If Travis CI is happy with this PR, then you can be sure that those fixtures are not needed anymore.
* | | Merge pull request #17872 from ↵Santiago Pastorino2014-12-021-3/+0
|\ \ \ | | | | | | | | | | | | | | | | claudiob/remove-duplicate-functional-caching-fixture Remove one AV fixture (duplicate of an AP fixture)