aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Remove unneeded Deprecation silenceRafael Mendonça França2017-01-061-5/+3
|
* `self.` is not needed when calling its own instance methodAkira Matsuda2017-01-056-7/+7
| | | | Actually, private methods cannot be called with `self.`, so it's not just redundant, it's a bad habit in Ruby
* Merge pull request #27549 from mpugach/consider_params_in_current_pageRafael França2017-01-043-2/+20
|\ | | | | Add "check_parameters" option to "current_page?"
| * Add `check_parameters` option to `current_page?`Maksym Pugach2017-01-043-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: For "http://www.example.com/shop/checkout?order=desc&page=1" current_page?('http://www.example.com/shop/checkout') => true current_page?( 'http://www.example.com/shop/checkout', check_parameters: true ) => false
* | Fix typo s/permited/permitted/Ryuta Kamizono2017-01-041-2/+2
| | | | | | | | | | | | | | | | | | ``` % git grep -n permited actionview/test/template/url_helper_test.rb:238: def test_button_to_with_permited_strong_params actionview/test/template/url_helper_test.rb:245: def test_button_to_with_unpermited_strong_params activerecord/test/cases/relations_test.rb:1620: def test_update_on_relation_passing_active_record_object_is_not_permited ```
* | Generate indexed names in input even when objects are not persistedRafael Mendonça França2017-01-032-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When you ask to generate multiple nested inputs using: field_for('comments[]', Comment.new) do |c| c.text_field :body Rails should generated the names like `post[comments][][body]`. To make sure we don't have regression the fake models now use the same implementation of `#to_param` as `ActiveRecord::Base` Fixes #26942
* | Prevent duplicate data-disable-with attributesTyler Hunt2017-01-032-14/+25
|/ | | | | | When using the hash form of the data option, prevent duplicate data-disable-with attributes from appearing in the submit tag due to both string and symbol forms of the hash key being present.
* Bump license years for 2017Jon Moss2016-12-312-2/+2
| | | | | | | | Per https://www.timeanddate.com/counters/firstnewyear.html, it's already 2017 in a lot of places, so we should bump the Rails license years to 2017. [ci skip]
* Merge pull request #27463 from y-yagi/fix_26931Rafael França2016-12-283-2/+11
|\ | | | | do not mutate `object_name` of class in `fields_for`
| * do not mutate `object_name` of class in `fields_for`yuuji.yaginuma2016-12-273-2/+11
| | | | | | | | | | | | Since it affects the entire form, should not mutate `object_name` of class. Fixes #26931
* | Fix Rubocop violations and fix documentation visibilityRafael Mendonça França2016-12-287-33/+32
| | | | | | | | | | | | Some methods were added to public API in 5b14129d8d4ad302b4e11df6bd5c7891b75f393c and they should be not part of the public API.
* | Fix typo in action_view/template.rb [ci skip]kenta-s2016-12-281-1/+1
|/
* assert_equal takes expectation firstAkira Matsuda2016-12-261-5/+5
|
* "Use assert_nil if expecting nil. This will fail in minitest 6."Akira Matsuda2016-12-254-16/+16
|
* self. is not needed when calling its own instance methodAkira Matsuda2016-12-241-2/+1
|
* Privatize unneededly protected methods in Action ViewAkira Matsuda2016-12-247-39/+32
|
* No need to nodoc private methodsAkira Matsuda2016-12-249-20/+20
|
* Wrong rake task name in the documentAkira Matsuda2016-12-241-1/+1
| | | | [ci skip]
* Privatize unneededly protected methods in Action View testsAkira Matsuda2016-12-235-5/+5
|
* Describe what we are protectingAkira Matsuda2016-12-231-0/+2
|