aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #32414 from bogdan/query-cache-optimizationRafael França2018-04-042-12/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Optimize the code inside AR::QueryCache middleware
| * | | | | | | | | Optimize the code inside AR::QueryCache middlewareBogdan Gusiev2018-04-042-12/+6
| | | | | | | | | |
* | | | | | | | | | Merge pull request #32456 from EiNSTeiN-/patch-1Rafael França2018-04-041-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Remove superfluous `ActionController::`
| * | | | | | | | | Remove superfluous `ActionController::`Francois Chagnon2018-04-041-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #32435 from ↵Eileen M. Uchitelle2018-04-043-7/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bogdanvlviv/add-missing-dots-at-the-end-of-comments Add missing dots at the end of comments in environment file templates
| * | | | | | | | | Add missing dots at the end of comments in environment file templatesbogdanvlviv2018-04-033-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dots in order to keep consistency between other comments in these files.
* | | | | | | | | | Merge pull request #32448 from ↵Eileen M. Uchitelle2018-04-041-0/+8
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | yhirano55/add_private_option_to_delegate_section_in_guide [ci skip] Add :private option to delegate section in guide
| * | | | | | | | | [ci skip] Add :private option to delegate section in guideYoshiyuki Hirano2018-04-041-0/+8
| | | | | | | | | |
* | | | | | | | | | Class methods in the `class_methods` blocks are wrongly appeared in the docRyuta Kamizono2018-04-045-5/+5
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is wrongly appeared as instance public methods in the doc. http://api.rubyonrails.org/v5.1.6/classes/ActionCable/Channel/Callbacks.html http://api.rubyonrails.org/v5.1.6/classes/ActiveRecord/Timestamp.html
* | | | | | | | | Merge pull request #32439 from yhirano55/fix_rendering_test_in_railtieYuji Yaginuma2018-04-041-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix RenderingTest in railtie
| * | | | | | | | | Fix RenderingTest in railtieYoshiyuki Hirano2018-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test class name is not `RoutingTest` but `RenderingTest`
* | | | | | | | | | Merge pull request #32434 from bogdanvlviv/use-default-option-of-mattr_accessorAndrew White2018-04-031-2/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Use `:default` option in order to set default value of `finalize_compiled_template_methods`
| * | | | | | | | | Use `:default` option in order to set default value of ↵bogdanvlviv2018-04-031-2/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `finalize_compiled_template_methods` Since we introduced default option for `class_attribute` and `mattr_accessor` family of methods and changed all occurrences of setting default values by using of `:default` option I think it would be fine to use `:default` option in order to set default value of `finalize_compiled_template_methods` since it expresses itself very well. Related to #29294, #32418
* | | | | | | | | removes obsolete images in guides [ci skip]Xavier Noria2018-04-032-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that tab_yellow.gif exists, that is the one being used.
* | | | | | | | | remove obsolete author imagesXavier Noria2018-04-036-0/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | The credits page is gone after #32429, these images are now orphan.
* | | | | | | | Merge pull request #32432 from prathamesh-sonpatki/credits-cleanupAndrew White2018-04-032-10/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Cleanup credits related code as it is removed now in PR #32429
| * | | | | | | | Cleanup credits related code as it is removed now in PR #32429Prathamesh Sonpatki2018-04-032-10/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #32429 from yhirano55/remove_credits_html_from_rails_guidesKasper Timm Hansen2018-04-036-89/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove credits.html from Rails Guides
| * | | | | | | | Remove credits.html from Rails GuidesYoshiyuki Hirano2018-04-036-89/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refs #32420
* | | | | | | | | Merge pull request #32430 from yhirano55/display_db_drop_desc_in_activerecordRyuta Kamizono2018-04-031-1/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Display db:drop description in ActiveRecord
| * | | | | | | | | Display db:drop description in ActiveRecordYoshiyuki Hirano2018-04-031-1/+3
| |/ / / / / / / /
* | | | | | | | | Merge pull request #32427 from tjschuck/small_doc_fixesRyuta Kamizono2018-04-034-7/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small doc fixes [ci skip]
| * | | | | | | | | Small doc fixesT.J. Schuck2018-04-024-7/+7
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge pull request #32428 from EarthSchlange/patch-1Ryuta Kamizono2018-04-031-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Doc fix added missing quote [ci skip]
| * | | | | | | | Doc fix added missing quoteMichael H2018-04-021-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #32418 from urbanautomaton/disable-template-finalizer-in-testRafael França2018-04-025-1/+33
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Disable ActionView::Template finalizers in test environment
| * | | | | | | | Add `action_view.finalize_compiled_template_methods` config optionSimon Coffey2018-04-025-1/+33
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionView::Template instances compile their source to methods on the ActionView::CompiledTemplates module. To prevent leaks in development mode, where templates can frequently change, a finalizer is added that undefines these methods[1] when the templates are garbage-collected. This is undesirable in the test environment, however, as templates don't change during the life of the test. Moreover, the cost of undefining a method is proportional to the number of descendants a class or module has, since the method cache must be cleared for all descendant classes. As ActionView::CompiledTemplates is mixed into every ActionView::TestCase (or in RSpec suites, every view spec example group), it can end up with a very large number of descendants, and undefining its methods can become very expensive. In large test suites, this results in a long delay at the end of the test suite as all template finalizers are run, only for the process to then exit. To avoid this unnecessary cost, this change adds a config option, `action_view.finalize_compiled_template_methods`, defaulting to true, and sets it to false in the test environment only. [1] https://github.com/rails/rails/blob/09b2348f7fc8d4e7191e70e06608c5909067e2aa/actionview/lib/action_view/template.rb#L118-L126
* | | | | | | | Merge pull request #32336 from vincedevendra/allow_mutating_dig_return_valueAaron Patterson2018-04-022-1/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make mutating params#dig return value mutate underlying params
| * | | | | | | | Make mutating params#dig mutate underlying paramsVince DeVendra2018-03-242-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When #dig was called on a params object and return either a Hash or an Array, and that value was subsquently mutated, it would not modify the containing params object. That means that the behavior of `params.dig(:a, :b)[:c] = 1` did not match either `params[:a][:b][:c] = 1` nor `hash.dig(:a, :b)[:c] = 1`. Similarly to `ActionController::Parameters#[]`, use `#convert_hashes_to_parameters` to pre-convert values and insert them in the receiving params object prior to returning them.
* | | | | | | | | Merge pull request #32404 from mathieumahe/masterGuillermo Iguaran2018-04-023-1/+39
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Extract the confirm call in its own, overridable method in rails_ujs
| * | | | | | | | | Extract the confirm call in its own, overridable method in rails_ujsMathieu2018-04-013-1/+39
| | | | | | | | | |
* | | | | | | | | | Merge pull request #32415 from kamipo/remove_foreign_keys_moduleGuillermo Iguaran2018-04-024-15/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Remove `ForeignKeys` module which was introduced at #32299
| * | | | | | | | | | Remove `ForeignKeys` module which was introduced at #32299Ryuta Kamizono2018-04-024-15/+2
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To solve the problem #32299, just enough to introduce `fk_ignore_pattern` option. I don't think there is a need to expose these constants.
* | | | | | | | | | Merge pull request #32416 from yhirano55/not_generate_needless_files_in_guidesRafael França2018-04-021-25/+27
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Not generate needless files in guides
| * | | | | | | | | | Not generate needless files in guidesYoshiyuki Hirano2018-04-021-25/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not generate needless files: * _license.html.erb, _welcome.html.erb are partial files. * layout.html.erb is the layout file.
* | | | | | | | | | | [ci skip] Fully quantify Active Record module in changelog.Kasper Timm Hansen2018-04-021-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #32417 from bogdan/base-classKasper Timm Hansen2018-04-028-9/+27
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add AR::Base.base_class? predicate
| * | | | | | | | | | | Add AR::Base.base_class? predicateBogdan Gusiev2018-04-028-9/+27
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #32065 from ↵Kasper Timm Hansen2018-04-026-130/+137
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sikachu/move-SourceAnnotationExtractor-under-rails-namespec Move SourceAnnotationExtractor under Rails module
| * | | | | | | | | | Run `bundle update` on bootsnapPrem Sichanugrist2018-03-231-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.2.1 fixes a bug in `Kernel.require` and resolve a test failure. See https://github.com/Shopify/bootsnap/pull/143
| * | | | | | | | | | Add deprecation note for SourceAnnotationExtractorPrem Sichanugrist2018-03-221-0/+7
| | | | | | | | | | |
| * | | | | | | | | | Make Annotation into a proper classPrem Sichanugrist2018-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This cleans up the documentation for SourceAnnotationExtractor because RDoc does not seems to know how to parse `Struct.new() do` block.
| * | | | | | | | | | Move SourceAnnotationExtractor under Rails modulePrem Sichanugrist2018-03-225-123/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This class should be under Rails module as it belongs to Rails.
* | | | | | | | | | | Merge pull request #32407 from razh/fix-rails-ujs-html-content-testYuji Yaginuma2018-04-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in rails-ujs HTML content test
| * | | | | | | | | | | Fix typo in rails-ujs HTML content testRaymond Zhou2018-04-011-1/+1
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `</ps>` is not a valid closing tag for `<p>`.
* | | | | | | | | | | Merge pull request #32406 from ↵Kasper Timm Hansen2018-04-014-23/+23
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | olivierlacan/actionview-helpers-docs-consistent-spacing Use consistent spacing in actionview helper docs
| * | | | | | | | | | | Use consistent spacing in actionview helper docs [ci skip]Olivier Lacan2018-04-014-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spacing in these comments is fairly inconsistent. Array argument contents are often separated with a space from the array literal brackets but in several cases the Hash literal curly braces are tangent to their contents which makes the documentation harder to read in some cases.
* | | | | | | | | | | | Merge pull request #32287 from razh/fix-rails-ujs-html-contentKasper Timm Hansen2018-04-012-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Pass HTML responses as plain-text in rails-ujs
| * | | | | | | | | | | Pass HTML responses as plain-text in rails-ujsRaymond Zhou2018-03-192-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running HTML responses through `DOMParser#parseFromString` results in complete `HTMLDocument` instances with unnecessary surrounding tags. For example: new DOMParser().parseFromString('<p>hello</p>', 'text/html') Will output: <html> <head></head> <body> <p>hello</p> </body> </html> This is passed to the `ajax:success` handler as `event.detail[0]` (`data`), but cannot be used directly without first traversing the document. To resolve this, only XML content is passed through `parseFromString`, while HTML content is treated as plain-text. This matches the behavior of jquery-ujs, which relied on jQuery's response-type inference.
* | | | | | | | | | | | Merge pull request #32268 from freeletics/encrypted-tmp-file-nameKasper Timm Hansen2018-04-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | Change temporary file name extension while editing encrypted file.