aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #26162 from kamipo/take_respects_dirty_targetRafael França2016-08-163-19/+19
|\ | | | | `CollectionProxy#take` should respect dirty target
| * `CollectionProxy#take` should respect dirty targetRyuta Kamizono2016-08-143-19/+19
| | | | | | | | | | `#first`, `#second`, ..., `#last` methods respects dirty target. But `#take` doesn't respect it. This commit fixes the inconsistent behavior.
* | Merge pull request #26019 from agrobbin/schema-load-unique-column-indicesRafael França2016-08-163-3/+19
|\ \ | | | | | | Support multiple indexes on the same column when loading the schema
| * | support multiple indexes on the same column when loading the schemaAlex Robbin2016-08-023-3/+19
| | |
* | | Merge pull request #26157 from ↵Rafael França2016-08-162-0/+2
|\ \ \ | | | | | | | | | | | | | | | | y-yagi/remove_test_mailers_when_skipping_action-mailer remove "test/mailers" directory when skipping action-mailer
| * | | remove "test/mailers" directory when skipping action-maileryuuji.yaginuma2016-08-142-0/+2
| | |/ | |/| | | | | | | Related to #26146
* | | Merge pull request #26130 from yui-knk/drop_tableRafael França2016-08-161-1/+3
|\ \ \ | | | | | | | | Drop a temporary table before end of a test case
| * | | Drop a temporary table before end of a test caseyui-knk2016-08-141-1/+3
| | | |
* | | | Add three new rubocop rulesRafael Mendonça França2016-08-16362-1797/+1809
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style/SpaceBeforeBlockBraces Style/SpaceInsideBlockBraces Style/SpaceInsideHashLiteralBraces Fix all violations in the repository.
* | | | Merge pull request #26177 from achinn/ac-live-deadlockMatthew Draper2016-08-163-1/+30
|\ \ \ \ | | | | | | | | | | Fix ActionController::Live deadlock
| * | | | Fix deadlock that can occur when child live thread tries to load a constant ↵Alex Chinn2016-08-153-1/+30
| | | | | | | | | | | | | | | | | | | | after writing to the stream.
* | | | | Merge pull request #26178 from claudiob/load-table-metadataRafael França2016-08-151-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Eager autoload ActiveRecord::TableMetadata
| * | | | Eager autoload ActiveRecord::TableMetadataclaudiob2016-08-151-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug that can occur when ActiveJob tries to access ActiveRecord. Specifically, I had an Active Job process fail on Sidekiq with this error: ``` ActiveJob::DeserializationError: Error while trying to deserialize arguments: uninitialized constant ActiveRecord::Core::ClassMethods::TableMetadata Did you mean? ActiveRecord::TableMetadata ``` raised by these lines of code: ``` [GEM_ROOT]/gems/activerecord-5.0.0.1/lib/active_record/core.rb:300 :in `table_metadata` 298 299 def table_metadata # :nodoc: 300 TableMetadata.new(self, arel_table) 301 end 302 end [GEM_ROOT]/gems/activerecord-5.0.0.1/lib/active_record/core.rb:273 :in `predicate_builder` [GEM_ROOT]/gems/activerecord-5.0.0.1/lib/active_record/core.rb:290 :in `relation` ``` The problem seems to be that, inside ActiveRecord::Core, the `TableMetadata` class has not been loaded and, therefore, Rails tries to access the constant `ActiveRecord::Core::ClassMethods::TableMetadata` which does not exist. Eager loading `ActiveRecord::TableMetadata` should fix the issue. @rafaelfranca -- see our Campfire discussion
* | | | Merge pull request #26176 from stomar/clarify-update-taskVipul A M2016-08-161-1/+1
|\ \ \ \ | | | | | | | | | | Clarify use of update task on 4.2 and earlier [ci skip]
| * | | | Clarify use of update task on 4.2 and earlier [ci skip]Marcus Stollsteimer2016-08-151-1/+1
| | | | |
* | | | | Merge pull request #26167 from kamipo/remove_find_nth_with_limit_and_offsetKasper Timm Hansen2016-08-151-34/+13
|\ \ \ \ \ | | | | | | | | | | | | Remove `find_nth_with_limit_and_offset` private method
| * | | | | Remove `find_nth_with_limit_and_offset` private methodRyuta Kamizono2016-08-151-34/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `find_nth` is protected method, therefore `offset` has not been passed anywhere. `find_nth_with_limit_and_offset` is unnecessary anymore because `offset` has not been passed.
* | | | | | Merge pull request #26170 from eugeneius/rm_log_subscriber_odd_ivarKasper Timm Hansen2016-08-151-5/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Remove odd ivar from ActiveRecord::LogSubscriber
| * | | | | Remove odd ivar from ActiveRecord::LogSubscriberEugene Kenny2016-08-151-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was used to switch the output colour between log lines, but now the output colour is based on the type of statement being logged instead.
* | | | | | Merge pull request #26160 from prathamesh-sonpatki/use-encoding-from-metalMatthew Draper2016-08-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | AC::Metal is already defining default encoding as UTF 8, let's reuse it.
| * | | | | | AC::Metal is already defining default encoding as UTF 8, let's reuse it.Prathamesh Sonpatki2016-08-141-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #25570 from y-yagi/remove_useless_parameterEileen M. Uchitelle2016-08-151-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove useless parameter
| * | | | | | remove useless parameteryuuji.yaginuma2016-06-291-4/+4
| | | | | | |
* | | | | | | Merge pull request #26168 from chuckdishmon/fix-plural-usageJon Moss2016-08-141-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | fix usage of pluralized word [ci skip]
| * | | | | | fix usage of pluralized wordchuckdishmon2016-08-141-1/+1
|/ / / / / /
* | | | | | Merge pull request #26166 from kamipo/fix_ar_fixtures_docJon Moss2016-08-141-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix `ActiveRecord::FixtureSet` docs [ci skip]
| * | | | | | Fix `ActiveRecord::FixtureSet` docs [ci skip]Ryuta Kamizono2016-08-151-4/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveSupport::TestCase` was replaced `ActiveRecord::TestCase` in #26150. But this docs is for rails apps per se, it should be `ActiveSupport::TestCase`. See https://github.com/rails/rails/pull/26150#discussion_r74710989.
* | | | | | Revert "Clarify and fix typos in Autoloading Disabled upgrade guide [ci skip]"Xavier Noria2016-08-151-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: See https://github.com/rails/rails/pull/26163#issuecomment-239703322 This reverts commit 39effc857e5c774670d6fad1a26aebcc33c51f0a.
* | | | | | Merge pull request #26150 from kamipo/consolidate_ar_test_case_and_as_test_caseSean Griffin2016-08-143-21/+20
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Consolidate `ActiveRecord::TestCase` and `ActiveSupport::TestCase` in AR test cases
| * | | | | Consolidate `ActiveRecord::TestCase` and `ActiveSupport::TestCase` in AR ↵Ryuta Kamizono2016-08-143-21/+20
| | |/ / / | |/| | | | | | | | | | | | | test cases
* | | | | Pass along original attribute to save later recursionAaron Patterson2016-08-142-1/+8
| | | | | | | | | | | | | | | | | | | | Fixes #26122
* | | | | Merge pull request #26012 from grosser/grosser/missingSean Griffin2016-08-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | add more array methods to straight delegation to speed up calling them
| * | | | | add index to array methods so we can call it on relationsMichael Grosser2016-08-121-1/+1
| | | | | |
* | | | | | Merge pull request #26163 from olivierlacan/clarify-autoloading-disabledJon Moss2016-08-141-12/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Clarify and fix typos in autoloading disabled section
| * | | | | | Clarify and fix typos in Autoloading Disabled upgrade guide [ci skip]Olivier Lacan2016-08-141-12/+12
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Guides section about autoloading being disabled was slightly confusing (#24724) and didn't directly reference the removed feature by name (config.autoload_paths) making it much harder for someone to search the upgrade guides for a mention or serendipitously find it via a Google search when running into autoloading issues. I also fixed some confusing turns of phrase and a missing word. /cc @vipulnsward @jvanbaarsen
* | | | | | [ci skip] Link to the request helpers documentation.Kasper Timm Hansen2016-08-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's tough for people without the knowledge of where the `get` and friends integration test helpers are defined to find documentation for them. Add a link to the main integration test documentation.
* | | | | | [ci skip] Update integration test request encoding documentation.Kasper Timm Hansen2016-08-141-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Give the section a header to distinguish it from the general doc. * Replace backticks with + signs to fit SDoc. * Use double quoted strings. * Clarify how `parsed_body` works — it doesn't depend on `as` anymore.
* | | | | | Merge pull request #26159 from prathamesh-sonpatki/fix-cache-logging-docKasper Timm Hansen2016-08-141-8/+16
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix the documentation for configuring `enable_fragment_cache_logging`…
| * | | | | Fix the documentation for configuring `enable_fragment_cache_logging` [ci skip]Prathamesh Sonpatki2016-08-141-8/+16
|/ / / / / | | | | | | | | | | | | | | | - It is Action Controller config, not Action View.
* | | | | Merge pull request #26146 from bcardarella/bc-clean-up-action-mailer-dirsRafael França2016-08-132-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Ensure app/mailers is removed when skipping action-mailer
| * | | | | Ensure app/mailers is removed when skipping action-mailerBrian Cardarella2016-08-122-0/+2
|/ / / / / | | | | | | | | | | | | | | | Closes #26145
* | | | | Merge pull request #25856 from mrageh/improve-lazy-load-hook-docsRafael França2016-08-121-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Add documentation about `ActiveSupport.on_load`
| * | | | | Add documentation about `ActiveSupport.on_load`mrageh2016-08-131-0/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] This commit adds some docs that explain how `LazyLoadHooks.on_load` method works.
* | | | | Merge pull request #26113 from kamipo/use_ar_test_case_instead_of_as_test_caseRafael França2016-08-122-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Use `ActiveRecord::TestCase` rather than `ActiveSupport::TestCase` in AR test cases
| * | | | | Use `ActiveRecord::TestCase` rather than `ActiveSupport::TestCase` in AR ↵Ryuta Kamizono2016-08-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | test cases
* | | | | | Merge pull request #26143 from nathanl/self-explanatory-cache-durationsRafael França2016-08-122-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make cache max-age durations self-explanatory
| * | | | | | Make cache max-age durations self-explanatoryNathan Long2016-08-122-2/+2
| | | | | | |
* | | | | | | Merge pull request #26100 from vipulnsward/changelogsRafael França2016-08-126-13/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Pass over changelogs
| * | | | | | | Pass over changelogs [ci skip]Vipul A M2016-08-106-13/+16
| | | | | | | |
* | | | | | | | Make private method privateRafael Mendonça França2016-08-121-11/+11
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-22 19:16:44 +0000