aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #19685 from vngrs/actionview_parent_layout_bugRafael Mendonça França2015-04-082-8/+31
|\ | | | | fix for actionview parent layout bug
| * fix for actionview parent layout bugMehmet Emin İNAÇ2015-04-082-8/+31
| | | | | | | | | | | | | | This commit fixes issue #19626 Don't need to check layout conditions if there is no condition test for parent layout bug fix
* | Merge pull request #19661 from Azdaroth/fields-for-child-index-lambdaRafael Mendonça França2015-04-063-1/+26
|\ \ | |/ |/| Accept lambda as child_index option in #fields_for method
| * Accept lambda as child_index option in #fields_for methodKarol Galanciak2015-04-053-1/+26
| |
* | head no_content when there is no template or action performedStephen Bussey2015-04-051-1/+1
|/
* Merge pull request #19644 from y-yagi/auto_discovery_link_tag_docYves Senn2015-04-051-1/+1
|\ | | | | correct output of auto_discovery_link_tag [ci skip]
| * correct output of auto_discovery_link_tag [ci skip]yuuji.yaginuma2015-04-041-1/+1
| |
* | Merge pull request #19649 from aprescott/allow-array-defaultsMatthew Draper2015-04-053-1/+12
|\ \ | | | | | | | | | Allow an array to be a default translation value.
| * | Allow an array to be a default translation value.Adam Prescott2015-04-043-1/+14
|/ / | | | | | | | | | | | | | | | | | | | | 4.2.1 introduced a change to the way `translate`/`t` works with an option of `default: [[]]`. In 4.2.0, this would give a default value of `[]`, but in 4.2.1, it leads to a missing translation. `default: [[]]` is again allowed for cases where a default of `[]` is needed. This addresses GitHub issue 19640.
* / [skip ci] Update information about #link_to attributesAnton Davydov2015-04-041-4/+3
|/
* Freeze static arguments for gsubbrainopia2015-04-021-1/+1
|
* Prefer string patterns for gsubbrainopia2015-04-021-1/+1
| | | | | | | | | | | | | | | | | https://github.com/ruby/ruby/pull/579 - there is a new optimization since ruby 2.2 Previously regexp patterns were faster (since a string was converted to regexp underneath anyway). But now string patterns are faster and better reflect the purpose. Benchmark.ips do |bm| bm.report('regexp') { 'this is ::a random string'.gsub(/::/, '/') } bm.report('string') { 'this is ::a random string'.gsub('::', '/') } bm.compare! end # string: 753724.4 i/s # regexp: 501443.1 i/s - 1.50x slower
* [skip ci] Add information about #link_to target optionAnton Davydov2015-04-011-0/+6
|
* Merge pull request #19535 from JuanitoFatas/doc/av-commentYves Senn2015-03-271-1/+1
|\ | | | | [ci skip] Unify the code comment in ActionView::Renderer#render_template...
| * [ci skip] Unify the code comment in ActionView::Renderer#render_template.Juanito Fatas2015-03-271-1/+1
| |
* | Add missing :html option in determine_template error message.Juanito Fatas2015-03-271-1/+1
|/
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-03-263-10/+11
|\ | | | | | | | | Conflicts: guides/source/4_0_release_notes.md
| * [ci skip] Fix `&>` with `%>`yui-knk2015-03-251-9/+9
| |
| * [ci skip] Add a line between code example and docsyui-knk2015-03-211-0/+1
| |
| * [ci skip] Add space after erb block.yui-knk2015-03-121-1/+1
| |
* | Simplify setting button form optionsCarlos Antonio da Silva2015-03-221-2/+3
| | | | | | | | No need to merge hashes when simply setting options does the job.
* | Rework form helper example to use Person.newCarlos Antonio da Silva2015-03-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | The previous change 92a3c8dcdf174dab5e8759031b6bbe6cd891fe3c improved this example, but calling .create + #valid? ends up running validations twice, and we don't want to showcase that. Lets use the normal use case of building a new object and calling #save on it, which is what a basic scaffold with Active Record does. [ci skip]
* | [ci skip] Check a result of `valid?` instead of `create`yui-knk2015-03-211-1/+2
| |
* | Merge pull request #19421 from jcoyne/translate_defaults_with_nilRafael Mendonça França2015-03-203-1/+14
| | | | | | | | Strip nils out of default translations. Fixes #19419
* | Revert "Merge pull request #19404 from dmathieu/remove_rack_env"Jeremy Kemper2015-03-201-1/+1
| | | | | | | | | | | | | | Preserving RACK_ENV behavior. This reverts commit 7bdc7635b885e473f6a577264fd8efad1c02174f, reversing changes made to 45786be516e13d55a1fca9a4abaddd5781209103.
* | [Fix Select tag Tests] Test correct use of multiple option for selectAkshay Vishnoi2015-03-201-4/+4
| |
* | don't fallback to RACK_ENV when RAILS_ENV is not presentDamien Mathieu2015-03-191-1/+1
| |
* | Remove additional handling of boolean attributes on button to helperCarlos Antonio da Silva2015-03-181-30/+0
| | | | | | | | | | | | | | | | This logic was just doing duplicated work, since the button_to helper relies on tag/content_tag to generate the button html, which already handles all boolean attributes it knows about. The code dates back to 2005: 43c470fae468ef63e0d5c3dc1e202925685fd47b.
* | Closes rails/rails#18864: Renaming transactional fixtures to transactional testsBrandon Weiss2015-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I’m renaming all instances of `use_transcational_fixtures` to `use_transactional_tests` and “transactional fixtures” to “transactional tests”. I’m deprecating `use_transactional_fixtures=`. So anyone who is explicitly setting this will get a warning telling them to use `use_transactional_tests=` instead. I’m maintaining backwards compatibility—both forms will work. `use_transactional_tests` will check to see if `use_transactional_fixtures` is set and use that, otherwise it will use itself. But because `use_transactional_tests` is a class attribute (created with `class_attribute`) this requires a little bit of hoop jumping. The writer method that `class_attribute` generates defines a new reader method that return the value being set. Which means we can’t set the default of `true` using `use_transactional_tests=` as was done previously because that won’t take into account anyone using `use_transactional_fixtures`. Instead I defined the reader method manually and it checks `use_transactional_fixtures`. If it was set then it should be used, otherwise it should return the default, which is `true`. If someone uses `use_transactional_tests=` then it will overwrite the backwards-compatible method with whatever they set.
* | Cleaning JavaScriptHelperTestThiago Pradi2015-03-141-8/+1
| |
* | Cleaning unused views from actionpack tests inside actionviewThiago Pradi2015-03-141-1/+0
| |
* | Zlib isn't required for AssetTagHelperTest anymoreThiago Pradi2015-03-141-1/+0
| |
* | Cleaning unused methods from abstract_unitThiago Pradi2015-03-141-57/+0
| |
* | Deleting unused fixturesThiago Pradi2015-03-142-10/+0
| |
* | [ci skip] correct output of selectKuldeep Aggarwal2015-03-131-15/+15
| |
* | [CI SKIP] Correct output of options_for_selectAkshay Vishnoi2015-03-131-5/+5
| |
* | Merge pull request #19252 from kaspth/single-escaping-strip-tagsRafael Mendonça França2015-03-103-2/+6
|\ \ | | | | | | Let strip_tags leave HTML escaping to Rails.
| * | Let strip_tags leave HTML escaping to Rails.Kasper Timm Hansen2015-03-103-2/+6
| | | | | | | | | | | | Prevents double escaping errors, such as "&" becoming "&".
* | | Target Ruby 2.2.1 in gemspecsPeter Suschlik2015-03-091-1/+1
|/ / | | | | | | This is a follow-up to #19257
* | Merge pull request #19221 from matthewd/random-testsMatthew Draper2015-03-062-6/+1
|\ \ | | | | | | Run all our tests in random order
| * | Revert "For now, we will keep sorting the tests."Matthew Draper2015-03-061-1/+1
| | | | | | | | | | | | This reverts commit 7025d7769dc53f0a3ffab8b537727ef3fee367fc.
| * | Revert "Leave all our tests as order_dependent! for now"Matthew Draper2015-03-061-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2f52f969885b2834198de0045748436a4651a94e. Conflicts: actionmailer/test/abstract_unit.rb actionview/test/abstract_unit.rb activemodel/test/cases/helper.rb activerecord/test/cases/helper.rb activesupport/test/abstract_unit.rb railties/test/abstract_unit.rb
* | | put the changelog entry in the right file :sweat: [ci skip]Yves Senn2015-03-061-0/+7
| | |
* | | `number_to_percentage` and `precision: 0` work with `NAN` and `INFINITY`.Yves Senn2015-03-061-0/+4
| | | | | | | | | | | | Closes #19227.
* | | don't need to rescue Exception in this caseAaron Patterson2015-03-052-1/+7
| | |
* | | [ci skip] Delete excess white in documentationAnton Davydov2015-03-051-1/+1
| | |
* | | [ci skip] Add information about sanitize option in TextHelper#highlightAnton Davydov2015-03-051-1/+6
|/ /
* | Merge pull request #19144 from y-yagi/fix_streaming_bufferRafael Mendonça França2015-03-043-1/+13
|\ \ | | | | | | fix ActionView::Template::Error when using Streaming with capture.
| * | fix ActionView::Template::Error when using Streaming with capture.yuuji.yaginuma2015-03-013-1/+13
| |/ | | | | | | can't acquire a encoding from StreamingBuffer. fixes #12001
* | Fix spelling [ci skip]Yu Haidong2015-03-041-8/+8
| |