aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove warning from big integer testyuuji.yaginuma2016-10-311-1/+1
| | | | | | | | This removes the following warnings. ``` activemodel/test/cases/type/big_integer_test.rb:15: warning: ambiguous first argument; put parentheses or a space even after `-' operator ```
* Fix the variable scoping issue I introduced in ↵Matthew Draper2016-10-281-2/+2
| | | | 007e50d8e5a900547471b6c4ec79d9d217682c5d
* Merge PR #19759Arthur Neves2016-10-283-1/+24
|\ | | | | | | Fix for has_and_belongs_to_many & has_many_through associations
| * Fix for has_and_belongs_to_many & has_many_through associations while ↵Mehmet Emin İNAÇ2016-02-133-2/+24
| | | | | | | | | | | | | | | | partial_writes is false This will fix #19663 Also with this fix, active record does not fire unnecassary update queries while partial_writes is true
* | Merge pull request #23698 from ↵Arthur Nogueira Neves2016-10-281-11/+1
|\ \ | | | | | | | | | | | | meinac/add_missing_types_into_ar_model_generator_usage Dynamically show available sql types [ci skip]
| * | Dynamically show available sql types [ci skip]Mehmet Emin İNAÇ2016-02-161-11/+1
| | | | | | | | | | | | Dynamically list available sql data types based on current database adapter.
* | | Hide commands from API site.Kasper Timm Hansen2016-10-2813-17/+17
| | | | | | | | | | | | | | | They're just barren on the site and confure more than guide, instead rely on the built in --help to guide users.
* | | Merge pull request #26688 from kamipo/remove_respond_to_indexesKasper Timm Hansen2016-10-282-18/+9
|\ \ \ | | | | | | | | Remove unnecessary `respond_to?(:indexes)` checking
| * | | Remove unnecessary `respond_to?(:indexes)` checkingRyuta Kamizono2016-10-032-18/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently all adapters (postgresql, mysql2, sqlite3, oracle-enhanced, and sqlserver) implemented `indexes` and schema dumper expects implemented `indexes`. https://github.com/rails/rails/blob/v5.0.0/activerecord/lib/active_record/schema_dumper.rb#L208 Therefore `respond_to?(:indexes)` checking is unnecessary.
* | | | [ci skip] Revise TagHelper only permitting symbols doc.Kasper Timm Hansen2016-10-281-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to 454460e. Rebuild the sentence so the bit about only symbols allowed comes less out of left field and fits in better with the existing doc. Also remove the `(Legacy syntax)` construct. The sections are properly nested under `=== Options` with `====` and look fine on the generated API doc site.
* | | | Merge pull request #26919 from Erol/add-assets-version-optionKasper Timm Hansen2016-10-281-0/+2
|\ \ \ \ | | | | | | | | | | Add documentation for `config.assets.version`
| * | | | Add documentation for `config.assets.version` [skip ci]Erol Fornoles2016-10-281-0/+2
|/ / / /
* | | | Explicitly show --no-helper and --no-assets options in help messageAkira Matsuda2016-10-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | I'm sorry for causing #24168. I wasn't aware of --no-helper and --no-assets. So I'm adding them to the help message. I'm still not sure how to show `--no-test-framework` though.
* | | | Merge pull request #26917 from kamipo/fix_stopdoc_to_startdocRafael França2016-10-281-1/+1
|\ \ \ \ | | | | | | | | | | Fix :stopdoc: to :startdoc: [ci skip]
| * | | | Fix :stopdoc: to :startdoc: [ci skip]Ryuta Kamizono2016-10-281-1/+1
| | | | |
* | | | | 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
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 04:20:18 +0000