aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #23770 from meinac/fix_habtm_symbol_class_nameArthur Nogueira Neves2016-10-272-2/+14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fix HABTM associations join table resolver bug on constants and symbols
| * | | | | | | | Fix HABTM associations join table resolver bug on constants and symbolsMehmet Emin İNAÇ2016-10-272-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using Constant and symbol class_name option for associations are valid but raises exception on HABTM associations. There was a test case which tries to cover symbol class_name usage but doesn't cover correctly. Fixed both symbol usage and constant usage as well. These are all working as expected now; ``` has_and_belongs_to_many :foos, class_name: 'Foo' has_and_belongs_to_many :foos, class_name: :Foo has_and_belongs_to_many :foos, class_name: Foo ``` Closes #23767
* | | | | | | | | Permit loads while queries are runningMatthew Draper2016-10-275-25/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A query may wait on a database-level lock, which could lead to a deadlock between threads.
* | | | | | | | | Merge pull request #26915 from jules2689/time-zone-conversion-inherited-bugSean Griffin2016-10-271-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fixes an issue where time_zone_conversion that causes an exception in…
| * | | | | | | | Fixes an issue where time_zone_conversion that causes an exception in ARs ↵Julian Nadeau2016-10-271-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delegation Following off of https://github.com/rails/rails/issues/15945, I realized that super needs to be the first thing that is called in an AbstractModel's inherited method. I was receiving errors within the inherited method of time_zone_conversion, so I tested locally by moving super to the top of the method declaration. All exceptions went away.
* | | | | | | | removes requires already present in active_support/railsXavier Noria2016-10-277-9/+0
| | | | | | | |
* | | | | | | | Merge pull request #26899 from kamipo/use_regex_matchXavier Noria2016-10-2710-13/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use Regexp#match? rather than Regexp#===
| * | | | | | | | Use Regexp#match? rather than Regexp#===Ryuta Kamizono2016-10-2610-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to 99cf7558000090668b137085bfe6bcc06c4571dc.
* | | | | | | | | let Regexp#match? be globally availableXavier Noria2016-10-2726-25/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regexp#match? should be considered to be part of the Ruby core library. We are emulating it for < 2.4, but not having to require the extension is part of the illusion of the emulation.
* | | | | | | | | Merge pull request #26907 from y-yagi/remove_unused_RedirectBackErrorArthur Nogueira Neves2016-10-261-8/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | remove unused `RedirectBackError` class
| * | | | | | | | | remove unused `RedirectBackError` classyuuji.yaginuma2016-10-271-8/+0
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Follow up to 333bfd896e87862cece95deb1ef88132d5f54ba8
* | | | | | | | | Merge pull request #26906 from y-yagi/fix_initializer_nameJon Moss2016-10-261-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | fix initializer name [ci skip]
| * | | | | | | | fix initializer name [ci skip]yuuji.yaginuma2016-10-271-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This changed in c046660
* | | | | | | | Clear the correct query cacheSamuel Cochran2016-10-262-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This executor currently relies on `ActiveRecord::Base.connection` not changing between `prepare` and `complete`. If something else returns the current ActiveRecord connection to the pool early then this `complete` call will fail to clear the correct query cache and restore the original `query_cache_enabled` status. This has for example been happening in Sidekiq: https://github.com/mperham/sidekiq/pull/3166 We can just keep track of the connection as part of the exector state.
* | | | | | | | Remove all Journey constant from public APIRafael Mendonça França2016-10-265-7/+17
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were never public API only there by mistake. [ci skip]
* | | | | | | Merge pull request #26896 from j-dexx/update_habtm_docsVipul A M2016-10-261-3/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update HABTM documentation in guides [ci skip]
| * | | | | | | Update HABTM documentation in guidesJames Doyley2016-10-261-3/+1
|/ / / / / / /
* | | | | | | Merge pull request #26895 from yui-knk/use_same_class_on_transform_valuesGuillermo Iguaran2016-10-251-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Ensure `#transform_values` of HWIDA to return HWIDA
| * | | | | | | Ensure `#transform_values` of HWIDA to return HWIDAyui-knk2016-10-261-0/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Ruby 2.4, naitive `Hash#transform_values` is implemented. `Hash#transform_values` uses an instance of Hash (`rb_hash_new`) to collect returned values of a block. For ensuring `#transform_values` of HWIDA to return HWIDA, we should define `#transform_values` on HWIDA.
* | | | | | | Merge pull request #25432 from ↵Eileen M. Uchitelle2016-10-251-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/polymorphic_reflection_is_not_using_methods_from_through_reflection `PolymorphicReflection` is not using the methods from `ThroughReflection`
| * | | | | | | `PolymorphicReflection` is not using the methods from `ThroughReflection`Ryuta Kamizono2016-06-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ThroughReflection` initializes `@delegate_reflection` and delegate all public methods to `delegate_reflection`. But `PolymorphicReflection` does not initialize `@delegate_reflection`. It is enough to inherit `AbstractReflection` (using `alias_candidate` only).
* | | | | | | | WhitespaceRafael Mendonça França2016-10-251-0/+1
| | | | | | | |
* | | | | | | | Merge pull request #26851 from Gaurav2728/update-kindlerbRafael França2016-10-253-11/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | update kindlerb gem
| * | | | | | | | update kindlerb gemGaurav Sharma2016-10-213-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby Kindle periodical-format ebook generator
* | | | | | | | | Remove mona lisa image from the testsRafael Mendonça França2016-10-255-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This image has copyright that we are not giving so it is better to use one image that we own the copyright.
* | | | | | | | | Fix HTML escaping in the guidesRafael Mendonça França2016-10-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | render :html escapes the argument if not provided as html safe.
* | | | | | | | | Merge pull request #26888 from Erol/fix-api-documentation-typoVipul A M2016-10-251-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix small typo in ActionView API documentation [ci skip]
| * | | | | | | | | Fix small typo in ActionView API documentation [ci skip]Erol Fornoles2016-10-251-1/+1
|/ / / / / / / / /
* | | | | | | | | Fix indentationRafael Mendonça França2016-10-251-1/+1
| | | | | | | | |
* | | | | | | | | Generate HTML not plain textRafael Mendonça França2016-10-251-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #26869 from prathamesh-sonpatki/fix-brittle-mysql-testsGuillermo Iguaran2016-10-241-4/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix brittle tests which were relying on the error message text from mysql2 gem
| * | | | | | | | | Fix brittle tests which were relying on the error message text from mysql2 gemPrathamesh Sonpatki2016-10-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - These tests were fixed earlier on master in https://github.com/rails/rails/commit/f13ec72664fd13d33d617103ca964a7592295854. - They started failing in first place due to change in https://github.com/brianmario/mysql2/commit/f14023fcfee9e85e6fc1b0e568048811518f8c23. - They will fail again when the message is changed in mysql2 so let's not rely on the error message.
* | | | | | | | | | Merge pull request #26885 from lastgabs/fix-active-job-testRafael França2016-10-251-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Uses queue adapter_method instead of ActiveJob::Base.queue_adapter
| * | | | | | | | | | Uses queue adapter_method instead of ActiveJob::Base.queue_adapterGabi Stefanini2016-10-241-2/+2
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change ActiveJob::Base.queue_adapter to use queue_adapter method to make test code consistent.
* | | | | | | | | | Fix plain option in the rails_guides generatorRafael Mendonça França2016-10-251-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #26868 from prathamesh-sonpatki/use-hash-compact-from-ruby-24Rafael França2016-10-242-20/+29
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Use Hash#compact and Hash#compact! from Ruby 2.4
| * | | | | | | | | | Use Hash#compact and Hash#compact! from Ruby 2.4Prathamesh Sonpatki2016-10-232-20/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Ruby 2.4 has added Hash#compact and Hash#compact! so we can use it now. - Reference: https://bugs.ruby-lang.org/issues/11818 and https://bugs.ruby-lang.org/issues/12863.
* | | | | | | | | | | Merge pull request #26883 from ↵Rafael França2016-10-242-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/remove_assets_config_if_skip_sprockets_is_true remove assets config from `new_framework_defaults` if `--skip-sprockets` is true
| * | | | | | | | | | | remove assets config from `new_framework_defaults` if `--skip-sprockets` is trueyuuji.yaginuma2016-10-252-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `sprockets` is not loaded, `Rails.application.config.assets` is not defined.
* | | | | | | | | | | | Missing require extract_optionsAkira Matsuda2016-10-251-0/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Copy-edits on #26880Rafael Mendonça França2016-10-241-32/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Put a blank line after :call-seq: otherwise it will think the whole test is the call seq. * Improve some text. * Use some rdoc formatting. * Restores the documentation of table_name_prefix. [ci skip]
* | | | | | | | | | | | Merge pull request #26880 from TempestMia/model_schema_doc_stringsRafael Mendonça França2016-10-241-44/+103
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix model schema doc strings
| * | | | | | | | | | | | Fix model schema doc stringsMia Zbikowski2016-10-241-44/+103
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #26878 from Erol/fix-guide-typoGuillermo Iguaran2016-10-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in Upgrading Ruby on Rails Guide [ci skip]
| * | | | | | | | | | | | Fix typo in Upgrading Ruby on Rails Guide [ci skip]Erol Fornoles2016-10-241-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #26876 from y-yagi/update_description_of_etagप्रथमेश Sonpatki2016-10-241-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | update description of Etag [ci skip]
| * | | | | | | | | | | update description of Etag [ci skip]yuuji.yaginuma2016-10-241-1/+4
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The document is written with "only generate weak", but it can also be used to strong etag. Also, add missing entory for #24387
* | | | | | | | | | | Merge release note entry for Date/Time/DateTime extensionsCarlos Antonio da Silva2016-10-231-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first release note entry mentioned #on_weekday?, but that was only added by the second PR mentioned there. To simplify reading the notes just merge the two, since they are related methods. [ci skip]
* | | | | | | | | | | Merge pull request #26871 from maclover7/jm-fix-26867Jon Moss2016-10-231-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Small grammar fix for #26867
| * | | | | | | | | | | Small grammar fix for #26867Jon Moss2016-10-231-1/+2
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-31 22:17:11 +0000