aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into require_relative_2017Xavier Noria2017-07-0224-236/+257
|\
| * Expectation firstAkira Matsuda2017-07-022-8/+8
| |
| * Avoid shadowed variableMatthew Draper2017-07-021-2/+2
| |
| * Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"Matthew Draper2017-07-02191-191/+1
| | | | | | | | | | This reverts commit 3420a14590c0e6915d8b6c242887f74adb4120f9, reversing changes made to afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.
| * Merge pull request #29540 from kirs/rubocop-frozen-stringMatthew Draper2017-07-02191-1/+191
| |\ | | | | | | | | | Enforce frozen string in Rubocop
| | * Enforce frozen string in RubocopKir Shatrov2017-07-01191-1/+191
| | |
| * | Merge pull request #29506 from pat/frozen-string-literalsMatthew Draper2017-07-0221-225/+225
| |\ \ | | | | | | | | | | | | Make ActiveSupport frozen-string-literal friendly.
| | * | Make ActionView frozen string literal friendly.Pat Allan2017-06-2019-220/+220
| | | | | | | | | | | | | | | | Plus a couple of related ActionPack patches.
| | * | Make ActionMailer frozen string literal friendly.Pat Allan2017-06-202-3/+3
| | | |
| | * | Make ActiveModel frozen string literal friendly.Pat Allan2017-06-201-2/+2
| | | | | | | | | | | | | | | | Includes two external changes because they're referenced within the ActiveModel test suite.
| * | | Merge pull request #29349 from robertomiranda/responsive-imagesMatthew Draper2017-07-023-3/+24
| |\ \ \ | | | | | | | | | | | | | | | Add srcset option to image_tag helper
| | * | | Add `srcset` option to `image_tag` helperRoberto Miranda2017-06-293-2/+23
| | | |/ | | |/|
* | / | [Action View] require => require_relativeAkira Matsuda2017-07-0125-35/+35
|/ / /
* / / Fallback Parameters#to_s to Hash#to_sKir Shatrov2017-06-301-0/+6
|/ / | | | | Fixes https://github.com/rails/rails/issues/29617
* | Merge pull request #29588 from greysteil/add-gemspec-linksRafael França2017-06-281-0/+5
|\ \ | | | | | | Add source code and changelog links to gemspecs
| * | Add source code and changelog links to gemspecsGrey Baker2017-06-281-0/+5
| | |
* | | :scissors:Ryuta Kamizono2017-06-281-4/+4
|/ / | | | | | | [ci skip]
* | Add changes to CHANGELOGsavroff2017-06-191-0/+6
| | | | | | | | | | | | fix fix
* | Fix current_page? helper issue with engine root pathsavroff2017-06-192-4/+17
|/
* Use `require_relative` instead of `require` with full pathbogdanvlviv2017-06-141-1/+1
|
* Generate field ids in `collection_check_boxes` and `collection_radio_buttons`yuuji.yaginuma2017-06-114-18/+28
| | | | | This makes sure that the labels are linked up with the fields. Fixes #29014
* Don't rely on the @view_renderer being defined.Kasper Timm Hansen2017-06-081-2/+2
| | | | That won't be true for Action Pack and Action Mailer.
* Merge pull request https://github.com/rails/rails/pull/28637 from ↵Kasper Timm Hansen2017-06-086-33/+42
| | | | st0012/fix-partial-cache-logging
* Use a hash to record every partial's cache hit status instead of sharing a ↵Stan Lo2017-06-087-3/+51
| | | | boolean.
* Don't support namespace in form_with.Kasper Timm Hansen2017-06-071-18/+0
| | | | | form_with requires people to pass an id manually, so users can just prefix their namespace right there.
* Move slicing to initializer.Kasper Timm Hansen2017-06-072-2/+2
| | | | | | Forgot all about https://github.com/rails/rails/pull/28844/files#r113780934 cc @rafaelfranca
* Use mattr_accessor default: option throughout the projectGenadi Samokovarov2017-06-037-25/+13
|
* Merge pull request #29187 from robin850/remove-mathnRafael França2017-05-301-3/+11
|\ | | | | Remove requirement on mathn
| * Remove requirement on mathnRobin Dupret2017-05-301-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | The test using mathn was first introduced in f1d9179 to check that the `distance_of_time_in_words` properly doesn't use the `Fixnum#/` method by explicitly requiring this library as it redefines this method. Given that `mathn` has been gemified in Ruby 2.5 and is deprecated since version 2.2, we can certainly safely assume that people will most-likely not require this library in their application. However, to make sure that we don't regress, let's add a test similar to the one before f1d9179.
* | Grammar fixesJon Moss2017-05-291-2/+3
| | | | | | | | [ci skip]
* | Merge pull request #29191 from ↵Kasper Timm Hansen2017-05-291-1/+1
|\ \ | | | | | | | | | | | | bogdanvlviv/pass_params_filename_lineno_to_class_eval Pass params __FILE__ and __LINE__ + 1 if class_eval with <<
| * | Pass params __FILE__ and __LINE__ + 1 if class_eval with <<bogdanvlviv2017-05-291-1/+1
| |/
* | Merge pull request #29151 from onemanstartup/jquery_slim_fixGuillermo Iguaran2017-05-291-1/+1
|\ \ | | | | | | Check for jQuery ajax
| * | Check for jQuery ajaxDmitriy Plekhanov2017-05-191-1/+1
| | | | | | | | | jQuery slim version doesn't have ajax, so if a person include this version ajaxFilter raises error.
* | | Add option for class_attribute default (#29270)David Heinemeier Hansson2017-05-295-24/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow a default value to be declared for class_attribute * Convert to using class_attribute default rather than explicit setter * Removed instance_accessor option by mistake * False is a valid default value * Documentation
* | | Merge pull request #29108 from inopinatus/ujs-sgjs-ie9-supportKasper Timm Hansen2017-05-281-1/+1
|\ \ \ | | | | | | | | Fix server-generated JS response processing on IE9
| * | | Fix server-generated JS response processing on IE9 when using rails-ujs and ↵Josh Goodall2017-05-171-1/+1
| | | | | | | | | | | | | | | | remote: true
* | | | Update to rails-ujs documentation for yarn installAdrian Stainforth2017-05-261-0/+10
| | | |
* | | | Merge pull request #29176 from bogdanvlviv/define-path-with__dir__Matthew Draper2017-05-2614-37/+35
|\ \ \ \ | | | | | | | | | | Define path with __dir__
| * | | | Define path with __dir__bogdanvlviv2017-05-2314-37/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ".. with __dir__ we can restore order in the Universe." - by @fxn Related to 5b8738c2df003a96f0e490c43559747618d10f5f
* | | | | Merge pull request #29119 from spohlenz/fix-select-with-enumerableMatthew Draper2017-05-242-1/+18
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix select tag helper used with Enumerable choices
| * | | | Fix select tag helper used with Enumerable choicesSam Pohlenz2017-05-172-1/+18
| | |/ / | |/| | | | | | | | | | | | | | | | | | Allows a custom object implementing Enumerable to be used as the choices parameter for a select tag, which previously wasn't possible due to the call to `empty?` on the choices (which isn't implemented on Enumerable).
* | | | Update test link in ActionView javascripts README.md.Josef Šimánek2017-05-221-1/+1
| |/ / |/| | | | | [ci skip]
* | | Add :json type to auto_discovery_link_tagMike Gunderloy2017-05-203-5/+12
| |/ |/| | | | | | | This allows auto_discovery_link_tag to support the JSON Feed standard. See https://jsonfeed.org/version/1 for more information.
* | Merge pull request #29057 from ↵Akira Matsuda2017-05-191-1/+1
|\ \ | | | | | | | | | | | | koic/suppress_warning_assigned_but_unused_variable Suppress `warning: assigned but unused variable - stdout`
| * | Suppress `warning: assigned but unused variable - stdout`Koichi ITO2017-05-121-1/+1
| |/
* | ERB::Util.url_encode no longer escapes ~ since ruby 2.5Akira Matsuda2017-05-191-2/+2
| | | | | | | | see: https://bugs.ruby-lang.org/issues/6696
* | Use recyclable cache keys (#29092)David Heinemeier Hansson2017-05-185-15/+23
|/
* Should escape meta characters in regexpRyuta Kamizono2017-05-074-10/+10
|
* Merge pull request #28753 from st0012/add-render-with-variants-testKasper Timm Hansen2017-05-013-0/+10
|\ | | | | Add tests for rendering with variants