aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #32536 from ↵Rafael França2018-04-113-3/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | lsylvester/fix-immutable-relation-error-with-http-caching-and-collection-caching Fix ActiveRecord::ImmutableRelation is raised when collection caching and HTTP caching are used together
| * | | | | don't check for immutability when setting skip_preloading as it doesn't ↵Lachlan Sylvester2018-04-123-3/+12
|/ / / / / | | | | | | | | | | | | | | | effect the arel and the arel may already be generated by fresh_when
* | | | | Merge pull request #32527 from nsgc/use_frozen_string_literalRafael França2018-04-111-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Use frozen string literal
| * | | | | Use frozen string literalNaoki Nishiguchi2018-04-111-0/+2
| | | | | |
* | | | | | Remove link for the kindle version of guides on edgeRafael Mendonça França2018-04-111-1/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/rails/rails-docs-server/pull/8 for reason. [ci skip]
* | | | | Unlock dalli versionyuuji.yaginuma2018-04-112-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | The issue was fixed with https://github.com/petergoldstein/dalli/pull/679, and a new version containing that fix was released.
* | | | | Merge pull request #32496 from yhirano55/fix_turbolinks_warning_in_railtiesRafael França2018-04-101-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix turbolinks warning in railties test
| * | | | | Fix turbolinks warning in railties testYoshiyuki Hirano2018-04-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Upgrade turbolinks from v5.0.1 to v5.1.0 * Fix warning in railties test lib/turbolinks/assertions.rb:17: warning: assigned but unused variable - visit_action
* | | | | | Merge pull request #32484 from kddeisz/default-headersRafael França2018-04-105-6/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | Include default headers by default in API mode
| * | | | | | Include default headers by default in API modeKevin Deisz2018-04-065-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionDispatch's default headers are now moved into their own module that are by default included in both Base and API. This allows API-mode applications to take advantage of the default security headers, as well as providing an easy way to add more.
* | | | | | | Specify which series I'm talking aboutRafael Mendonça França2018-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Update our security policy to include all releases in the current seriesRafael Mendonça França2018-04-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want people to jump from the last release in the previous series (4.2) straing to the first release in the current series that is support (5.1), so we should be supporting the entire series for severe security issues. This will not be a problem because usually we only have 3 releases in a series and backporting patches inside the same series is not harder than backporting to a previous series.
* | | | | | | Allow use of minitest-rails gem with Rails test runneryuuji.yaginuma2018-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add explicit global namespace to `Rails::TestUnit::Runner` to resolve a namespace conflict between `minitest-rails` and Rails test runner. Fixes #31324
* | | | | | | Remove upper bound on Capybaraeileencodes2018-04-104-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no reason to block future versions of Capybara since we don't _know_ they are going to break. How will we know if we have a conservative option set? This change prevents us from blocking users who want to upgrade in the future.
* | | | | | | Merge pull request #32517 from javan/ast/no-root-in-jsonJavan Makhmali2018-04-102-1/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Active Storage: Always exclude JSON root from direct_uploads#create response
| * | | | | | | Always exclude JSON root from direct_uploads#create responseJavan Makhmali2018-04-102-1/+24
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The JavaScript component expects a bare response. Fixes #32365
* | | | | | | 4.2 is still maintainedRafael Mendonça França2018-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is the last major release series.
* | | | | | | Merge pull request #32498 from eugeneius/mutation_tracker_merge_changesRyuta Kamizono2018-04-102-1/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Prevent changes_to_save from mutating attributes
| * | | | | | | Prevent changes_to_save from mutating attributesEugene Kenny2018-04-082-1/+9
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an array of hashes is added to a `HashWithIndifferentAccess`, the hashes are replaced with HWIAs by mutating the array in place. If an attribute's value is an array of hashes, `changes_to_save` will convert it to an array of HWIAs as a side-effect of adding it to the changes hash. Using `merge!` instead of `[]=` fixes the problem, as `merge!` copies any array values in the provided hash instead of mutating them.
* | | | | | | Merge pull request #32515 from ↵Ryuta Kamizono2018-04-101-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bogdanvlviv/add-test_request_format_kwarg_doesnt_mutate_params Add `TestCaseTest#test_request_format_kwarg_doesnt_mutate_params` to master
| * | | | | | | Add `TestCaseTest#test_request_format_kwarg_doesnt_mutate_params` to masterbogdanvlviv2018-04-101-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initially, the test was added to 5-0-stable in #32492 and a bit modified in #32506. This test ensures that request(in tests) doesn't mutate params. It was fixed since v5.1.0.beta1 by 98b8309569a326910a723f521911e54994b112fb and then on 5-0-stable by #32492. This commit adds this test to master branch in order to prevent any regressions.
* | | | | | | | Merge pull request #32508 from radar/radar/maintenance-policyRyuta Kamizono2018-04-101-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct Maintenance Policy for Rails 5.2 [ci skip]
| * | | | | | | | Correct Maintenance Policy for Rails 5.2Ryan Bigg2018-04-101-3/+3
| |/ / / / / / /
* | | | | | | | Merge pull request #32509 from bogdanvlviv/update-bug_report_templates-on-masterRyuta Kamizono2018-04-105-5/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Update bug report templates
| * | | | | | | Update bug report templatesbogdanvlviv2018-04-105-5/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Set Rails 5.2.0 in templates
* | | | | | | Merge pull request #32488 from swrobel/patch-4Rafael Mendonça França2018-04-091-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Only disable headless chrome gpu on Windows
| * | | | | | | Only disable headless chrome gpu on WindowsStefan Wrobel2018-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Per Chromium team this has not been necessary on other platforms for quite some time: https://bugs.chromium.org/p/chromium/issues/detail?id=737678#c1
* | | | | | | | Don't create namespaced tasks if single db applicationeileencodes2018-04-091-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was causing single db applications to have rake tasks named `db:create:primary`. These tasks are only useful to multiple database applications so they shouldn't be generated.
* | | | | | | | Add multidb application testeileencodes2018-04-092-16/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I realized I wasn't really testing some of the new rake tasks added so I built out this new test that uses a multi-db database.yml and allows us to run create/drop/migrate/schema:dump/schema:load and those that are namespaced like create:animals. This will make our testing more robust so we can catch problems quicker and set a good place to add future tests as these features evolve.
* | | | | | | | Allow schema/structure load for multiple databaseseileencodes2018-04-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the spec name to load_schema in order to load from the correct structure file when there are multiple databases
* | | | | | | | Merge pull request #32502 from mrhead/improve-error-messageEileen M. Uchitelle2018-04-091-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Improve the null origin error message
| * | | | | | | | Improve the null origin error messagePatrik Bóna2018-04-091-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #32497 from ↵Ryuta Kamizono2018-04-092-1/+9
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | eugeneius/mutation_tracker_changed_attribute_names Avoid generating full changes hash on every save
| * | | | | | | Avoid generating full changes hash on every saveEugene Kenny2018-04-082-1/+9
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `changed_attribute_names_to_save` is called in `keys_for_partial_write`, which is called on every save when partial writes are enabled. We can avoid generating the full changes hash by asking the mutation tracker for just the names of the changed attributes. At minimum this saves one array allocation per attribute, but will also avoid calling `Attribute#original_value` which is expensive for serialized attributes.
* | | | | | | Merge pull request #32494 from dixpac/as_fix_outdated_documentation_for_variantsRyuta Kamizono2018-04-082-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix leftover references to VariantsController in AS documentation [ci skip]
| * | | | | | | Fix leftover references to VariantsController [ci skip]dixpac2018-04-082-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VariantsController has been merged to RepresentationsController, this PR fixes outdated references to VariantsController in ActiveStorage documentation.
* | | | | | | | Merge pull request #32486 from floehopper/mocha-updatesGuillermo Iguaran2018-04-074-6/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Mocha updates
| * | | | | | | | Upgrade Mocha from v1.3.0 to v1.5.0James Mead2018-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mocha v1.5.0 is currently the latest release.
| * | | | | | | | Make Mocha setup explcitly Minitest-specificJames Mead2018-04-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been possible since Mocha v1.0 and makes it clear that we want Mocha to integrate with Minitest, not Test::Unit.
| * | | | | | | | Simplify declaration of mocha dependency in GemfileJames Mead2018-04-071-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `require: false` option hasn't been needed since Mocha v1.0.
* | | | | | | | | Fix test class name for `Assertions` moduleyuuji.yaginuma2018-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because this class includes not only `assert_difference` but also tests of other assertion methods.
* | | | | | | | | Merge pull request #32491 from yhirano55/enable_verbose_in_activestorageRyuta Kamizono2018-04-081-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Enable verbose option in ActiveStorage
| * | | | | | | | | Enable verbose option in ActiveStorageYoshiyuki Hirano2018-04-081-0/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #32489 from yhirano55/update_railties_rdoc_mainXavier Noria2018-04-071-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | rewords a bit RDOC_MAIN.rdoc [ci skip]
| * | | | | | | | rewords a bit RDOC_MAIN.rdoc [ci skip]Yoshiyuki Hirano2018-04-081-2/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * Same change as bba832d
* | / / / / / / rewords a bit README.md [ci skip]Xavier Noria2018-04-071-4/+4
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | [LinkedRach, Daniel Colson, Xavier Noria]
* | | | | | | Merge pull request #32487 from yhirano55/update_releasing_railsRyuta Kamizono2018-04-071-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Update URLs in RELEASING_RAILS.md [ci skip]
| * | | | | | Update URLs in RELEASING_RAILS.md [ci skip]Yoshiyuki Hirano2018-04-071-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * Use https instead of http with URI scheme for Travis * Update Url for "Agile Web Development with Rails"
* | | | | | Merge pull request #32485 from bogdanvlviv/fix-actionview/CHANGELOG.mdRyuta Kamizono2018-04-071-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix `actionview/CHANGELOG.md` [ci skip]
| * | | | | | Fix `actionview/CHANGELOG.md`bogdanvlviv2018-04-071-2/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add missing dots at the end of sentences. - Wrap RecordTagHelper into `. - `RecordTagHelper` => `ActionView::Helpers::RecordTagHelper`. [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 00:12:11 +0000