aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add allocations to template renderer subscriptionEileen Uchitelle2018-10-105-12/+27
| | | | | | | | | | | | | | | | | | | | | | | This PR adds the allocations to the instrumentation for template and partial rendering. Before: ``` Rendering posts/new.html.erb within layouts/application Rendered posts/_form.html.erb (9.7ms) Rendered posts/new.html.erb within layouts/application (10.9ms) Completed 200 OK in 902ms (Views: 890.8ms | ActiveRecord: 0.8ms) ``` After: ``` Rendering posts/new.html.erb within layouts/application Rendered posts/_form.html.erb (Duration: 7.1ms | Allocations: 6004) Rendered posts/new.html.erb within layouts/application (Duration: 8.3ms | Allocations: 6654) Completed 200 OK in 858ms (Views: 848.4ms | ActiveRecord: 0.4ms | Allocations: 1539564) ```
* Merge pull request #34075 from hakusaro/guides-reference-leasesGannon McGibbon2018-10-091-6/+7
|\ | | | | Change contributing guide to suggest using safer force push
| * Change contributing guide to use safer force pushLucas Nicodemus2018-10-041-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes the contributing guide in rails to suggest using git with force-with-lease over typical force pushing. In practice, most rails contributors won't ever encounter a situation where updating their local fork could result in lost changes as a result of a force push. That being said, git is a complex tool and arcane flags like force-with-lease are indeed safer, and by promoting it in rails, there's a chance more people will discover it and use it in other contexts outside of rails. In just the same way that herd immunity works by most people being vaccinated, proliferating knowledge of force-with-lease should help nudge people towards using safer git commands in general. [ci skip]
* | Merge pull request #34081 from gmcgibbon/db_migrate_status_moveEileen M. Uchitelle2018-10-093-13/+39
|\ \ | | | | | | Move db:migrate:status to DatabaseTasks method
| * | Move db:migrate:status to DatabaseTasks methodGannon McGibbon2018-10-083-13/+39
| | |
* | | Merge pull request #34105 from zvkemp/correct-asn-docsGannon McGibbon2018-10-092-4/+5
|\ \ \ | | | | | | | | clarify role of unique_id in ActiveSupport::Notifications [ci skip]
| * | | clarify role of unique_id in ActiveSupport::Notificationszvkemp2018-10-052-4/+5
| | | |
* | | | Merge pull request #34117 from ↵Ryuta Kamizono2018-10-101-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aergonaut/docs/ActiveRecord--Persistence-belongs_to_touch_method Add docs to ActiveRecord::Persistence#belongs_to_touch_method [ci skip]
| * | | | Add docs to ActiveRecord::Persistence#belongs_to_touch_methodChris Fung2018-10-071-0/+2
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Call `define_attribute_methods` before `assert_no_queries` to address CI ↵Ryuta Kamizono2018-10-095-9/+80
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flakiness Follow up 45be690f8e6db019aac6198ba49d608a2e14824b. Somehow calling `define_attribute_methods` in `build`/`new` sometimes causes the `table_exists?` query. To address CI flakiness due to `assert_no_queries` failure, ensure `define_attribute_methods` before `assert_no_queries`.
* | | | Merge pull request #34126 from gregmolnar/guide-link-fixRyuta Kamizono2018-10-092-2/+2
|\ \ \ \ | | | | | | | | | | fix broken link in Action Cable guides and readme [ci skip]
| * | | | fix broken link in Action Cable guides and readme [ci skip]Greg Molnar2018-10-082-2/+2
| | | | |
* | | | | Point to requiring the ASt engine in the installation instructions [ci skip]Donnie Propst2018-10-081-0/+2
| | | | |
* | | | | Fix directly uploading using a MIME type synonymGeorge Claghorn2018-10-082-1/+11
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | When Content-Type is "application/x-gzip", request.content_type resolves to "application/gzip", because application/x-gzip is a synonym of application/gzip by default. This causes the acceptable_content? check in ActiveStorage::DiskController to fail, because the direct upload token contains application/x-gzip, which is not equal to application/gzip. Fix by comparing the token content type with the request content type *and its synonyms*.
| * | | | Use content_mime_typeGraham Conzett2018-10-081-2/+1
| | | | |
| * | | | Fix issue ActiveStorage direct upload diskGraham Conzett2018-10-072-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an issue in ActiveStorage where a direct upload to disk storage would fail due to a content type mismatch if the file was uploaded using a mime-type synonym.
* | | | | Merge pull request #33324 from ↵Ryuta Kamizono2018-10-083-11/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Jcambass/fix-only-path-option-in-url-for-with-arrays respect only_path option when an array is passed into url_for
| * | | | | respect path_only option when an array is passed into url_forJoel Ambass2018-10-013-11/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The url_for method is now extracting the path_only option in order to determine if polymorphic_path or polymorphic_url should be called. If the path_only option is not set it will be set to true unless the host option is set. This behaviour is the same as when a Hash or Params object is passed. To support this unifying the code responsible for setting this default value has been extracted into a private method
* | | | | | Merge pull request #34039 from yskkin/parameter_filterRyuta Kamizono2018-10-087-125/+177
|\ \ \ \ \ \ | | | | | | | | | | | | | | Deprecate ActionDispatch::Http::ParameterFilter in favor of ActiveSup…
| * | | | | | Deprecate ActionDispatch::Http::ParameterFilter in favor of ↵Yoshiyuki Kinjo2018-10-087-125/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport::ParameterFilter
* | | | | | | Merge pull request #34119 from frodsan/patch-1Arun Agrawal2018-10-081-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [ci skip] Fix typo
| * | | | | | [ci skip] Fix typoFrancesco Rodríguez2018-10-081-1/+1
|/ / / / / /
* | | | | | Don't expose internal methods in the associationsRyuta Kamizono2018-10-082-32/+32
| | | | | |
* | | | | | Fix test name to add missing "set"Ryuta Kamizono2018-10-081-1/+1
| | | | | |
* | | | | | Fix `AssociationRelation` not to set inverse instance key just like beforeRyuta Kamizono2018-10-073-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #31575, `set_inverse_instance` replaces the foreign key by the current owner immediately to make it happen when a record is added to collection association. But `set_inverse_instance` is not only called when a record is added, but also when a record is loaded from queries. And also, that loaded records are not always associated records for some reason (using `or`, `unscope`, `rewhere`, etc). It is hard to distinguish whether or not we should invoke `set_inverse_instance`, but at least we should avoid the undesired side-effect which was brought from #31575. Fixes #34108.
* | | | | | Merge pull request #34076 from gmcgibbon/fixtures_refactorEileen M. Uchitelle2018-10-074-243/+376
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixtures refactor
| * | | | | | Move FixtureSet::ReflectionProxy and FixtureSet::HasManyThroughProxy to ↵Gannon McGibbon2018-10-052-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | FixtureSet::TableRows
| * | | | | | Introduce FixtureSet::TableRows and FixtureSet::TableRowGannon McGibbon2018-10-053-88/+183
| | | | | | |
| * | | | | | Introduce FixtureSet::ModelMetadataGannon McGibbon2018-10-052-29/+49
| | | | | | |
| * | | | | | Small refactors to FixtureSet::ClassCache and FixtureGannon McGibbon2018-10-051-9/+8
| | | | | | |
| * | | | | | Move FixtureSet.create_fixtures reading and inserting sections into private ↵Gannon McGibbon2018-10-051-41/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | methods
| * | | | | | Organize FixtureSet class methodsGannon McGibbon2018-10-051-102/+104
| | | | | | |
* | | | | | | Merge pull request #34114 from Madogiwa0124/update_getting_start_rails_versionEileen M. Uchitelle2018-10-071-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | getting started page rails version update to 5.2.1
| * | | | | | | getting started page rails version update to 5.2.1Madogiwa2018-10-071-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #34089 from lsylvester/test-cache-version-precisionRichard Schneeman2018-10-061-31/+55
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | add test for cache_version precision
| * | | | | | | | add test for cache_version precisionLachlan Sylvester2018-10-071-31/+55
|/ / / / / / / /
* | | | | | | | Merge pull request #34077 from cllns/clarify-activesupport-instructionYuji Yaginuma2018-10-061-0/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | ActiveStorage guide: Add instruction for test environment
| * | | | | | | | Add instruction for test environmentSean Collins2018-10-051-0/+8
| | | | | | | | |
* | | | | | | | | Merge pull request #34005 from tgturner/expand-cache-key-bug-fixRichard Schneeman2018-10-052-1/+50
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Array with single item correctly uses cache_key
| * | | | | | | | | Array with single item correctly uses cache_keyGraham Turner2018-10-052-1/+50
|/ / / / / / / / /
* | | | | | | | | Merge pull request #34084 from trustvox/masterRafael França2018-10-052-4/+2
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Remove "include FileUtils" sentence in setup/update bin files
| * | | | | | | | Remove "include FileUtils" sentence in setup/update bin filesBruno Casali2018-09-172-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According with rubocop style guide "Style/MixinUsage" is good to use only in class/module not directly in file.
* | | | | | | | | Remove unnecessary use of `included` in ActiveJob::CoreAlan Wu2018-10-051-21/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using `included` to define `attr_acessor` and `attr_writer` is causing these methods to not show up in the documentation.
* | | | | | | | | Merge pull request #34103 from albertoalmagro/guides-running-test-with-seedGannon McGibbon2018-10-051-0/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add documentation to run tests with specific seed [ci skip]
| * | | | | | | | | Add documentation to run tests with specific seed [ci skip]Alberto Almagro2018-10-051-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit documents how to run all tests or a single test file with a specific randomization seed.
* | | | | | | | | | Merge pull request #34101 from gmcgibbon/fix_bundler_1_16_6_test_failuresRafael França2018-10-051-8/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | Remove bundler warnings from bin/setup output
| * | | | | | | | | Remove bundler warnings from bin/setup outputGannon McGibbon2018-10-051-8/+10
| |/ / / / / / / /
* | | | | | | | | Merge pull request #34097 from kule/masterRafael França2018-10-054-1/+27
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Parameterized mailers can configure delivery job
| * | | | | | | | | Parameterized mailers can configure delivery jobLuke Pearce2018-10-054-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting parameterized_delivery_job on a mailer class will cause Parameterized::MessageDelivery to use the specified job instead of ActionMailer::Parameterized::DeliveryJob: class MyMailer < ApplicationMailer self.parameterized_delivery_job = MyCustomDeliveryJob ... end
* | | | | | | | | | Merge pull request #34102 from gmcgibbon/less_aggressive_auto_labelingRafael França2018-10-051-22/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Remove some autolabeling globs