aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Introduce ActionDispatch::DebugExceptions interceptorsGenadi Samokovarov2018-04-203-1/+59
| | | | | | | | | | | | | | Plugins interacting with the exceptions caught and displayed by ActionDispatch::DebugExceptions currently have to monkey patch it to get the much needed exception for their calculation. With DebugExceptions.register_interceptor, plugin authors can hook into DebugExceptions and process the exception, before being rendered. They can store it into the request and process it on the way back of the middleware chain execution or act on it straight in the interceptor. The interceptors can be play blocks, procs, lambdas or any object that responds to `#call`.
* Make JS views rendered work with content security policyyuuji.yaginuma2018-04-202-1/+8
| | | | | | | | As of now, `HTMLElement.nonce` seems to work only in Chrome. So, it should not be used now. https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/nonce#Browser_compatibility Fixes #32577.
* Merge pull request #32575 from ybakos/guides/testing/pluralize_class_namesRafael França2018-04-191-3/+3
|\ | | | | guides/testing: Pluralize controller and helper class names.
| * guides/testing: Pluralize controller and helper class names.Yong Bakos2018-04-141-3/+3
| | | | | | | | | | | | The Rails convention for controllers and helpers is plural, except where intentionally singular. Pluralize the controller and helper class names, to match convention.
* | Merge pull request #32650 from bogdanvlviv/return_back_slash_and_use___dir__Rafael França2018-04-192-2/+2
|\ \ | | | | | | Return back "/" to the end of RAILS_GEM_ROOT
| * | Return back "/" to the end of RAILS_GEM_ROOTbogdanvlviv2018-04-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The "/" was removed in 40bdbce191ad90dfea43dad51fac5c4726b89392 during refactoring. It may cause regression since looks like was added intentionaly because it is possible that a name of any another gem can start with /rails/, so slash was added to ensure that it is "rails" gem. I would like to backport this to `5-2-stable` too. - Use `__dir__` instead of `__FILE__`. Follow up #29176.
* | | Merge pull request #32574 from DmytroVasin/rails-ujs-stoppable-eventsRafael França2018-04-199-64/+73
|\ \ \ | | | | | | | | Rails-ujs: Info about stoppable events
| * | | Fix stoppable events in tests and docs.Dmytro Vasin2018-04-149-64/+73
| | |/ | |/|
* | | Revert "Merge pull request #32652 from ↵Rafael Mendonça França2018-04-191-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | bogdanvlviv/add-missing-changelog-for-32593" This reverts commit 78ff47f3e77925f72d98579da6feb68f36052ad8, reversing changes made to daffe03308bffc43ea343a886aab33082d83bb9c. That changelog entry should only be on 5-2-stable
* | | Merge pull request #32649 from rails/universal-ruby-versionGuillermo Iguaran2018-04-192-2/+2
|\ \ \ | | | | | | | | Create a .ruby-version compatible with MRI/JRuby by default
| * | | Create a .ruby-version compatible with MRI/JRuby by defaultGuillermo Iguaran2018-04-192-2/+2
| | |/ | |/|
* | | Don't expose `Relation#preload_associations` in the docRyuta Kamizono2018-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | The extracted method is used for `CollectionCacheAssociationLoading`, still not public API. [ci skip]
* | | Merge pull request #32654 from ↵Ryuta Kamizono2018-04-201-1/+1
|\ \ \ | | | | | | | | | | | | | | | | yahonda/suppress_ambiguous_first_argument_at_default_scoping_test Suppress `warning: ambiguous first argument`
| * | | Use assert_no_match for test_order_to_unscope_reorderingYasuo Honda2018-04-201-1/+1
| | | |
* | | | Merge pull request #32652 from bogdanvlviv/add-missing-changelog-for-32593Ryuta Kamizono2018-04-201-0/+12
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Add missing changelog entry [ci skip]
| * | | Add missing changelog entrybogdanvlviv2018-04-201-0/+12
| |/ / | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/pull/32593 was backported to `5-2-stable` but since 5.2.0 is released the changelog entry should be in Rails 6.0.0 too. [ci skip]
* | | Merge pull request #32645 from maneframe/skip_query_cache_mergeRafael Mendonça França2018-04-192-2/+6
|\ \ \ | |/ / |/| | | | | Fix relation merging with skip_query_cache!
| * | Fix relation merging with skip_query_cache!James Williams2018-04-193-3/+11
| | |
* | | Merge pull request #32648 from ↵Rafael França2018-04-196-13/+13
|\ \ \ | | | | | | | | | | | | | | | | bogdanvlviv/improve-pattern-filenames-to-catch-more-style-offences Allow rubocop check more files
| * | | Allow rubocop check more filesbogdanvlviv2018-04-196-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fix pattern of filenames for `CustomCops/AssertNot` and `CustomCops/RefuteNot`. rubocop should check every file under `test/`. Related to #32441, #32605
* | | | Merge pull request #32168 from christianblais/activesupport-ordinalize-i18nRafael França2018-04-194-13/+59
|\ \ \ \ | |/ / / |/| | | `#ordinal` and `#ordinalize` now support I18n
| * | | `ActiveSupport::Inflector#ordinal` and `ActiveSupport::Inflector#ordinalize`Christian Blais2018-03-054-13/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now support translations through I18n. { fr: { number: { nth: { ordinals: lambda do |_key, number:, **_options| if number.to_i.abs == 1 'er' else 'e' end end, ordinalized: lambda do |_key, number:, **_options| "#{number}#{ActiveSupport::Inflector.ordinal(number)}" end } } } }
* | | | Merge pull request #32401 from yhirano55/improve_css_in_guideRafael França2018-04-192-12/+2
|\ \ \ \ | | | | | | | | | | Improve css in guide
| * | | | Improve css in guideYoshiyuki Hirano2018-04-012-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * .clearfix is overridden. * .clear is not currently used. * #extraCol is not currently used. * table th, table td are overridden. Merged them. * Removed needless comment lines which are added on #6475
* | | | | Merge pull request #32636 from yhirano55/improve_line_tasksRafael França2018-04-192-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Improve redundancy in line tasks
| * | | | | Improve redundancy in line tasksYoshiyuki Hirano2018-04-192-2/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | * Remove needless concat from actionpack/Rakefile * Remove neesless File.join from actionview/Rakefile
* | | | | [ci skip] Restore of links in RDOC_MAIN after an update of the file (#32644)Felipe Tovar2018-04-191-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [ci skip] Update links in RDOC_MAIN and remove style of word rails in README * [ci skip] Update links in RDOC_MAIN and remove style of word rails in README [Felipe Tovar & Rafael Mendonça França]
* | | | | Merge pull request #32593 from sdhull/fix-strong-params-permit-bangRafael Mendonça França2018-04-192-2/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixes StrongParameters `permit!` to work with nested arrays
| * | | | | Fixes StrongParameters permit! to work with nested arraysSteve Hull2018-04-163-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `permit!` is intended to mark all instances of `ActionController::Parameters` as permitted, however nested arrays of params were not being marked permitted because the method did shallow iteration. This fixes that by flattening the array before calling `permit!` on all each item.
* | | | | | Merge pull request #32605 from composerinteralia/assert-notRafael França2018-04-19104-338/+429
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add RuboCop for `assert_not` over `assert !`
| * | | | | | Replace `assert !` with `assert_not`Daniel Colson2018-04-1998-328/+328
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This autocorrects the violations after adding a custom cop in 3305c78dcd.
| * | | | | | Add RuboCop for `assert_not` over `assert !`Daniel Colson2018-04-196-10/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We added `assert_not` in f75addd "to replace warty 'assert !foo'". fa8d35b agrees that it is warty, and so do I. This custom Rubocop rule turns the wart into a violation. As with my last custom cop, https://github.com/rails/rails/pull/32441, I want to make sure this looks right on code climate before pushing another commit to autocorrect everything. @toshimaru I just noticed https://github.com/toshimaru/rubocop-rails/pull/26 Is there a better way to add these custom cops, or were you saying we shouldn't have custom cops at all?
* | | | | | | Merge pull request #32637 from yhirano55/add_exclude_condition_in_rubocopRafael França2018-04-191-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add exculude condition in rubocop.yml
| * | | | | | | Add exculude condition in rubocop.ymlYoshiyuki Hirano2018-04-201-0/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * Excluded `railties/test/fixtures/tmp/**/*` from rubocop inspect files * These files are generated after running test in railties
* | | | | | | Merge pull request #32638 from yhirano55/navigate_edgeguide_from_github_templateRafael França2018-04-192-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Navigate edgeguides from .github template [ci skip]
| * | | | | | | Navigate edgeguide from .github template [ci skip]Yoshiyuki Hirano2018-04-202-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Navigate prefer edgeguide over guide * Because edgeguide is always described latest policy we have
* | | | | | | [ci skip] Remove style of the word Rails at the topGuillermo Iguaran2018-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | Similarly to https://github.com/rails/rails/pull/32626/commits/9c3fe52f5fa9904b43bf76be13f85db57c223d0c
* | | | | | | Merge pull request #32626 from ftovaro/masterXavier Noria2018-04-192-40/+54
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Update README and RDOC_MAIN
| * | | | | | | [ci skip] Remove style of the word Rails at the topFelipe Tovar2018-04-191-1/+1
| | | | | | | |
| * | | | | | | [ci skip] Missing \ in RDOC_MAINFelipe Tovar2018-04-190-0/+0
| |\ \ \ \ \ \ \
| | * | | | | | | [ci skip] update RDOC_MAINFelipe Tovar2018-04-191-23/+30
| | | | | | | | |
| * | | | | | | | [ci skip] update RDOC_MAINFelipe Tovar2018-04-191-23/+30
| |/ / / / / / /
| * | | | | | | Update READMEFelipe Tovar2018-04-181-18/+25
| | | | | | | |
* | | | | | | | Merge pull request #32635 from yhirano55/update_cocGuillermo Iguaran2018-04-191-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Update CoC to change a history of updates URL [ci skip]
| * | | | | | | Update CoC to change a history of updates URL [ci skip]Yoshiyuki Hirano2018-04-191-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A history of updates suggested archived URL, so changed new one: * [NEW] https://github.com/rails/homepage/commits/master/conduct.html * [OLD] https://github.com/rails/rails.github.com/commits/master/conduct/index.html
* | | | | | | Merge pull request #32625 from stephendolan/masterKasper Timm Hansen2018-04-191-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Fix minor system testing documentation typo.
| * | | | | | | [ci skip] Fix minor system testing documentation typo.Stephen2018-04-181-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #32627 from jlduran/make-master-key-readable-only-by-ownerAndrew White2018-04-193-0/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make the master.key readable only by the owner
| * | | | | | | | Make the master.key readable only by the ownerJose Luis Duran2018-04-193-0/+27
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change may only apply to POSIX-compliant systems. Previously: $ ls -l config/master.key -rw-r--r-- 1 owner group 32 Jan 1 00:00 master.key Now: $ ls -l config/master.key -rw------- 1 owner group 32 Jan 1 00:00 master.key
* | | | | | | | Merge pull request #32633 from bogdanvlviv/fix-ref-in-actionpack-changelogRyuta Kamizono2018-04-191-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix reference to fixed issue in actionpack/CHANGELOG.md [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 23:22:25 +0000