aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
Commit message (Collapse)AuthorAgeFilesLines
* Add `Style/EmptyLinesAroundMethodBody` in `.rubocop.yml` and remove extra ↵Ryuta Kamizono2017-02-122-2/+0
| | | | empty lines
* Merge pull request #27870 from kenta-s/get-todo-done-in-render_testKasper Timm Hansen2017-02-111-2/+1
|\ | | | | Get TODO done in `render_test`
| * Add information on `:formats` option in action_view_overview.mdkenta-s2017-02-061-2/+1
| |
* | Correct spellingBenjamin Fleischer2017-02-051-1/+1
|/ | | | | | | ``` go get -u github.com/client9/misspell/cmd/misspell misspell -w -error -source=text . ```
* Fix CI failure caused by aa647b46cce55ec12f5895e403c0d1b85502c8e0Ryuta Kamizono2017-02-021-1/+1
|
* Fix test failures only seen when executed via bin/testAkira Matsuda2017-02-021-1/+1
| | | | | sub_template_message distracts Rails.root from its message only when Rails.root is defined, and Rails.root is defined at tools/test.rb
* module Blog; class Post appears twice in AV testsAkira Matsuda2017-02-021-3/+3
| | | | This causes TypeError when loaded separately
* DRY fake models for testingAkira Matsuda2017-02-022-37/+7
|
* call `gem` `erubis` before requireyuuji.yaginuma2017-02-011-0/+1
| | | | For inform that need to add `erubis` to gemfile.
* Merge pull request #27795 from meagar/fix-missing-partial-iterationRafael França2017-01-314-1/+12
|\ | | | | Fix missing partial iteration
| * Merge branch 'master' into fix-missing-partial-iterationMatthew Eagar2017-01-262-2/+2
| |\
| * \ Merge branch 'master' into fix-missing-partial-iterationMatthew Eagar2017-01-2510-77/+197
| |\ \
| * | | Add partial iteration variable to template keysMatthew Eagar2017-01-254-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When rendering heterogeneous collection using `render @collection` or `render partial: @collection`, the expected `<partial_name>_iteration` variable is missing due to `find_template` not having the name of the iteration variable included in its cache keys.
* | | | Merge pull request #27858 from mtsmfm/fix-inherit-from-deprecated-erubisRafael França2017-01-313-1/+12
|\ \ \ \ | | | | | | | | | | Fix inherit from deprecated `ActionView::Template::Handlers::Erubis`
| * | | | Fix inherit from deprecated `ActionView::Template::Handlers::Erubis`Fumiaki MATSUSHIMA2017-02-013-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some classes inherit from `ActionView::Template::Handlers::Erubis`. (ex. https://github.com/haml/haml/blob/4.0.7/lib/haml/helpers/safe_erubis_template.rb#L3) ``` Class.new(ActionView::Template::Handlers::Erubis) # => TypeError: superclass must be a Class (ActiveSupport::Deprecation::DeprecatedConstantProxy given) ```
* | | | | Merge pull request #27758 from kenta-s/neglected-todo-in-render_testArthur Nogueira Neves2017-01-311-2/+1
|\ \ \ \ \ | |/ / / / |/| | | | Get neglected TODO done in render_test
| * | | | Get neglected TODO done in render_testkenta-s2017-01-241-2/+1
| | | | |
* | | | | Merge pull request #27738 from kenta-s/remove-unused-argument-formatsRafael França2017-01-312-27/+27
|\ \ \ \ \ | | | | | | | | | | | | Remove unused argument `formats`
| * | | | | Remove unused argument `formats`kenta-s2017-01-202-27/+27
| | | | | |
* | | | | | Improve insufficient test for `safe_join`kenta-s2017-01-301-2/+13
| | | | | |
* | | | | | use rails-html-sanitizer >= 1.0.3Toshi MARUYAMA2017-01-271-1/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | CVE-2015-7579 says rails-html-sanitizer 1.0.2 has XSS vulnerability.
* | | | | s/an/a/Akira Matsuda2017-01-262-2/+2
| |_|_|/ |/| | | | | | | | | | | [ci skip]
* | | | Fix grammar 'an hyphen' -> 'a hyphen' [ci skip]kenta-s2017-01-251-1/+1
| | | |
* | | | Merge pull request #27796 from yui-knk/keep_separator_wasAndrew White2017-01-251-1/+2
|\ \ \ \ | | | | | | | | | | Keep the value of `$,` and restore it
| * | | | Keep the value of `$,` and restore ityui-knk2017-01-251-1/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | As unit tests, we do not know the value of `$,` when this test case started. It' better to keep the value when the test case fnished.
* / | | Change ActionView ERB Handler from Erubis to ErubiJeremy Evans2017-01-258-75/+194
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Erubi offers the following advantages for Rails: * Works with ruby's --enable-frozen-string-literal option * Has 88% smaller memory footprint * Does no freedom patching (Erubis adds a method to Kernel) * Has simpler internals (1 file, <150 lines of code) * Has an open development model (Erubis doesn't have a public source control repository or bug tracker) * Is not dead (Erubis hasn't been updated since 2011) Erubi is a simplified fork of Erubis that contains just the parts that are generally needed (which includes the parts that Rails uses). The only intentional difference in behavior is that it does not include support for <%=== tags for debug output. That could be added to the ActionView ERB handler if it is desired. The Erubis template handler remains in a deprecated state so that code that accesses it directly does not break. It can be removed after Rails 5.1.
* | / Remove unnecessary comments in cache_helper.rb [ci skip]kenta-s2017-01-211-2/+0
| |/ |/|
* | Add missing tests for ActionView::Template::Textkenta-s2017-01-201-0/+16
| |
* | `find_templates` should be able to handle 5 argumentskenta-s2017-01-191-2/+2
|/
* Remove TODOs related to Exceptron [ci skip]kenta-s2017-01-181-2/+0
|
* Fix grammar in partial_renderer.rb [ci skip]kenta-s2017-01-181-1/+1
|
* :warning: "Use assert_nil if expecting nil. This will fail in MT6."Akira Matsuda2017-01-181-1/+6
| | | | | | These are followups for 307065f959f2b34bdad16487bae906eb3bfeaf28, but TBH I'm personally not very much confortable with this style. Maybe we could override assert_equal in our test_helper not to warn?
* Merge pull request #27665 from kenta-s/improve-compute_asset_extnameRafael França2017-01-181-1/+5
|\ | | | | compute_asset_extname should explicitly return nil in else clause
| * should explicitly returns nil in else clausekenta-s2017-01-131-1/+5
| |
* | Merge pull request #27693 from kenta-s/improve-to_sentence-methodRafael França2017-01-182-1/+11
|\ \ | | | | | | Fix unexpected behavior of `to_sentence` with $,
| * | Fix unexpected behavior of with $,kenta-s2017-01-152-1/+11
| | |
* | | Merge pull request #27688 from kenta-s/add-test-for-safe_joinRafael França2017-01-181-0/+5
|\ \ \ | | | | | | | | Add test for `safe_join`
| * | | Add test for safe_joinkenta-s2017-01-151-0/+5
| | | |
* | | | Remove unused variable 'regex'kenta-s2017-01-181-1/+1
| | | |
* | | | Don't pollute Object with rubinius_skip and jruby_skipAkira Matsuda2017-01-171-9/+9
| | | | | | | | | | | | | | | | we call them only in the tests
* | | | Merge pull request #27692 from y-yagi/make_render_work_with_ac_paramsEileen M. Uchitelle2017-01-161-1/+5
|\ \ \ \ | | | | | | | | | | make `render` work with AC::Params
| * | | | make `render` work with AC::Paramsyuuji.yaginuma2017-01-151-1/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 4.2, since AC::Params inherited `Hash`, processing in the case of `Hash` was done. But in 5.x, since AC::Params does not inherit `Hash`, need to add care for AC::Params. Related to 00285e7cf75c96553719072a27c27e4ab7d25b40
* | | | Update comment for Scrubber usage [ci skip]kenta-s2017-01-161-6/+4
| | | |
* | | | Allow render locals to be assigned to instance variablesAndrew White2017-01-154-1/+12
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | In #26672 we blocked use of Ruby keywords as identifiers for view locals but inadvertently broke the use of instance variable names as identifiers. Whilst not explicitly documented this behavior has been around for a long time and there's no need to break it now. Fixes #27480.
* | | Fix broken sample code in action_view/helpers/output_safety_helper.rb [ci skip]kenta-s2017-01-151-1/+1
|/ /
* | Fix grammar in asset_url_helper.rb [ci skip]kenta-s2017-01-131-3/+3
| |
* | class Foo < Struct.new(:x) creates an extra unneeded anonymous classAkira Matsuda2017-01-136-12/+10
| | | | | | | | because Struct.new returns a Class, we just can give it a name and use it directly without inheriting from it
* | Fix typo extention -> extension [ci skip]kenta-s2017-01-131-1/+1
|/
* Reduce string objects by using \ instead of + or << for concatenating stringsAkira Matsuda2017-01-129-528/+528
| | | | (I personally prefer writing one string in one line no matter how long it is, though)
* Use Encoding::UTF_8 constant for default_{internal,external} in the testsAkira Matsuda2017-01-111-2/+2
|