aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
Commit message (Collapse)AuthorAgeFilesLines
...
| * Add nil check in asset_pathAnton Kolomiychuk2015-06-292-0/+7
| |
* | Fix cache issue when different partials use the same collectionRoque Pinel2015-06-284-16/+36
| | | | | | | | | | | | | | | | | | Adds the `virtual_path` option to `cache_fragment_name` so it can be provided when needed. That allows `cache_collection_render` to get the appropriate cache key with the digest generated based on the template and prevent collision with other templates that cache the same collection.
* | Merge pull request #20417 from dubek/fix-template-cache-call-patternKasper Timm Hansen2015-06-263-1/+36
|\ \ | | | | | | Improve detection of partial templates eligible for collection caching.
| * | Improve detection of partial templates eligible for collection caching.Dov Murik2015-06-223-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The regular expression which was used to detect partial templates that begin with a `<% cache ... do %>` call missed some cases. This commits attempts to improve the detection for some cases such as multi-line comments at the beginning of the template. The different templates are listed in two new unit test methods. Note that specially crafted Ruby code can still evade such `cache`-call detection: for example, a user might have its own method which itself calls the Rails `cache` helper. In such a case, the template's code doesn't start with a literal `cache` string and therefore will not be eligible for collection caching.
* | | A few documentation fixes [ci skip]Robin Dupret2015-06-231-6/+6
|/ /
* | Merge pull request #20654 from repinel/remove-duplicate-privateRichard Schneeman2015-06-211-2/+0
|\ \ | | | | | | Remove duplicate private statement
| * | Remove duplicate private statementRoque Pinel2015-06-211-2/+0
| | |
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-06-215-6/+6
|\ \ \ | |/ / |/| | | | | | | | Conflicts: guides/source/configuring.md
| * | [ci skip] Fix to Fixed-width Fontyui-knk2015-06-143-4/+4
| | | | | | | | | | | | LookupContext is class name
| * | [ci skip] Add '.'yui-knk2015-06-141-1/+1
| | |
| * | [ci skip] Fix minutes to seconds in `select_second`yui-knk2015-06-091-1/+1
| | | | | | | | | | | | This is same type commit of https://github.com/rails/rails/pull/20463
* | | applies project style guidelinesXavier Noria2015-06-201-7/+7
| | | | | | | | | | | | Just saw these in passing while reading this file.
* | | removes unnecessary backslashes in regexpsXavier Noria2015-06-201-3/+3
| |/ |/| | | | | Colons are not metacharacters.
* | Nitpick :nail_care: [ci skip]Zachary Scott2015-06-181-1/+2
| |
* | Merge pull request #20549 from maurogeorge/distance_of_time_in_words-rdocZachary Scott2015-06-181-0/+20
|\ \ | | | | | | Add RDoc about scope option on distance_of_time_in_words
| * | Add RDoc about scope option on distance_of_time_in_wordsMauro George2015-06-181-0/+20
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #20108 from akshay-vishnoi/button-tagArthur Nogueira Neves2015-06-152-2/+22
|\ \ \ | | | | | | | | Add missing spec and documentation for button_tag helper
| * | | Add missing spec and documentation for button_tag helperAkshay Vishnoi2015-05-242-2/+22
| | | |
* | | | Merge pull request #20107 from ankit8898/av_refac_record_tag_helperArthur Nogueira Neves2015-06-151-2/+1
|\ \ \ \ | | | | | | | | | | Removed not needed includes, As record_tag_helper is moved to a gem we..
| * | | | Removed not needed includes, As record_tag_helper is moved to a gem we are notAnkit Gupta2015-05-101-2/+1
| |/ / / | | | | | | | | | | | | testing is completely here now. RenderErbUtils and AM::Conversion are not used
* | | | Merge pull request #20548 from maurogeorge/collection_check_boxes-rdoc-gotchaZachary Scott2015-06-141-0/+21
|\ \ \ \ | | | | | | | | | | Add gotcha to RDoc of collection_check_boxes
| * | | | Add gotcha to RDoc of collection_check_boxesMauro George2015-06-131-0/+21
| | |/ / | |/| | | | | | | | | | [ci skip]
* / | | Revert "revises a test to account for case-insensitive file systems"Matthew Draper2015-06-141-18/+2
|/ / / | | | | | | | | | This reverts commit d345ce9630ce4c01bc81a09fb015e7bd935600ad.
* | | Merge pull request #20480 from senny/test_runnerYves Senn2015-06-121-0/+4
|\ \ \ | | | | | | | | use our own runner for Rails framework components `bin/test`
| * | | select the AR adapter through `bin/test`.Yves Senn2015-06-111-0/+1
| | | |
| * | | use our runner (`bin/test`) for framework components.Yves Senn2015-06-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a script `bin/test` to most Rails framework components. The script uses the rails minitest plugin to augment the runner. See https://github.com/rails/rails/pull/19571 for details about the plugin. I did not yet add `bin/test` for activerecord, activejob and railties. These components rely on specific setup performed in the rake-tasks.
* | | | Merge pull request #20058 from farukaydin/cache-digests-dependency-rakeRafael Mendonça França2015-06-112-1/+22
|\ \ \ \ | | | | | | | | | | add error log that notify 'file not found' when using cache_digest dependency rake
| * | | | add error log that notify 'file not found' when using ↵Faruk AYDIN2015-05-072-1/+22
| | | | | | | | | | | | | | | | | | | | cache_digests:dependency and cache_digests:nested_dependency tasks
* | | | | Exclude cache_digests:dependencies rake task in api appJorge Bejar2015-06-111-2/+4
| |/ / / |/| | |
* | | | Tiny documentation edits [ci skip]Robin Dupret2015-06-091-7/+7
| | | |
* | | | Raise an ArgumentError when `include_blank` is false for a required field inGrey Baker2015-06-083-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Tags::Base#select_content_tag`. Previously, passing a falsey value to `include_blank` would be ignored if the field was required, and a blank line would still be inserted. The following will now raise instead of quietly failing: `select("post", "category", %w(a required field), { include_blank: false }, required: 'required')`
* | | | [ci skip] Fix hours to minutes in `select_minute`yui-knk2015-06-071-1/+1
| |_|/ |/| |
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-06-051-1/+1
|\ \ \
| * | | [ci skip] Fix typo you/yourclaudiob2015-05-231-1/+1
| | | |
* | | | Revert "Merge pull request #19685 from vngrs/actionview_parent_layout_bug"Rafael Mendonça França2015-06-022-31/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a9d58c77da800bb0052c9bfa432828b02526022c, reversing changes made to 041c2c879a3c4086ad3aa6d30fed1eede1d53c11. Reason: The old behavior is how it was working in previous version of Rails since 4.0.x so it is not safe to backport to a stable branch. See https://github.com/rails/rails/issues/19626#issuecomment-89862258 and https://github.com/rails/rails/pull/15050#issuecomment-45333449
* | | | Remove `assigns` and `assert_template`.Guo Xiang Tan2015-05-306-135/+38
| | | |
* | | | Merge pull request #20331 from arunagw/arunagw-remove-unused-package-tasksRafael Mendonça França2015-05-281-7/+0
|\ \ \ \ | | | | | | | | | | Remove unused package tasks
| * | | | Remove unused package tasksArun Agrawal2015-05-281-7/+0
| | | | | | | | | | | | | | | | | | | | We are using `all:build` now.
* | | | | Deprecate `:nothing` option for render methodMehmet Emin İNAÇ2015-05-281-1/+1
|/ / / / | | | | | | | | | | | | `head` method works similar to `render` method with `:nothing` option
* | | | Merge pull request #20263 from arunagw/aa-remove-custom-lines-actionviewRafael Mendonça França2015-05-281-21/+3
|\ \ \ \ | | | | | | | | | | Remove custom `lines` and use `/tools/line_statistics`
| * | | | Remove custom `lines` and use `/tools/line_statistics`Arun Agrawal2015-05-221-21/+3
| | | | |
* | | | | Merge pull request #20262 from arunagw/aa-remove-broken-unused-release-taskYves Senn2015-05-271-7/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove broken and unused release task
| * | | | | Remove broken and unused release taskArun Agrawal2015-05-221-7/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | - We do release with release.rb - There is no `rake/gemcutter`
* / / / / Remove deprecation warning.Guo Xiang Tan2015-05-221-1/+1
|/ / / / | | | | | | | | | | | | https://travis-ci.org/rails/rails/jobs/63594316#L1982
* | | | revises a test to account for case-insensitive file systemsXavier Noria2015-05-211-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patched test assumed the file system is case-sensitive, but that is not necessarily the case. In particular, this test did not pass in the recommended setup for the dev box, because the /vagrant shared folder is case-insensitive. After looking at some gems that provide access to file system metadata I have chosen to go with the check you can see in the patch because, albeit it's a bit dirty creating a file, it is super easy to understand and clearly portable. References https://github.com/rails/rails-dev-box/issues/102.
* | | | Fix docs markup for option_groups_from_collection_for_select [ci skip]Carlos Antonio da Silva2015-05-191-1/+1
| | | |
* | | | spelling fix [ci skip]karanarora2015-05-191-1/+1
| | | |
* | | | Pass over CHANGELOGS [ci skip]Prathamesh Sonpatki2015-05-161-2/+3
| | | |
* | | | Do not put partial name to local_assigns when rendering without an objectHenrik Nygren2015-05-144-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When one rendered a partial template without specifying an object or a collection (e.g. <%= render partial: 'partial_name' %>), Rails would make an object called :partial_name available in local_assigns. I don't think this was the intended behavior, since no local variable called 'partial_name' gets defined in the view.
* | | | Merge pull request #20149 from karanarora/Typo-fixRafael Mendonça França2015-05-131-11/+11
|\ \ \ \ | | | | | | | | | | remove redundant parenthesis.