aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #27528 from kamipo/extract_casted_booleansKasper Timm Hansen2016-12-312-18/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Extract `casted_true`/`casted_false` for `Type::ImmutableString`
| * | | | | | | | | Extract `casted_true`/`casted_false` for `Type::ImmutableString`Ryuta Kamizono2017-01-012-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only difference between `Type::ImmutableString` and its subclasses is the representation of the casted booleans. Prefer extracting `casted_true`/`casted_false` and override these by subclasses.
* | | | | | | | | | Merge pull request #27529 from kamipo/refactor_ids_readerKasper Timm Hansen2016-12-311-3/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Refactor `CollectionAssociation#ids_reader`
| * | | | | | | | | Refactor `CollectionAssociation#ids_reader`Ryuta Kamizono2017-01-011-3/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simply we can do `target.pluck(reflection.association_primary_key)` if `target` is loaded.
* | | | | | | | | Merge pull request #27527 from kamipo/array_subtype_optionsKasper Timm Hansen2016-12-312-4/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Dump array subtype options correctly
| * | | | | | | | | Dump array subtype options correctlyRyuta Kamizono2017-01-012-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently schema dumper does not dump array subtype `precision` and `scale` options. This commit fixes the issue.
* | | | | | | | | | Match Thor's `desc` signature.Kasper Timm Hansen2016-12-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can also take an options hash.
* | | | | | | | | | Prevent command name being printed twice.Kasper Timm Hansen2016-12-311-0/+8
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thor would inadvertantly duplicate the command usage because of the help method in a command class. Fixes #26664. [ Yuji Yaginuma & Kasper Timm Hansen ]
* | | | | | | | | Merge pull request #27525 from kirs/patch-1Kasper Timm Hansen2016-12-311-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update schema cache doc in guides/command_line
| * | | | | | | | | Update schema cache doc in guides/command_lineKir Shatrov2016-12-311-2/+2
|/ / / / / / / / /
* | / / / / / / / [ci skip] Update Active Model copyright years.Kasper Timm Hansen2016-12-312-2/+2
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missed in 37d956f. Fixes #27524. [ MSathieu & Kasper Timm Hansen ]
* | | | | | | | Merge pull request #27441 from koic/quoted_insert_version_sqlKasper Timm Hansen2016-12-311-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add a quote to an SQL insert statement of schema migration
| * | | | | | | | Add a quote to an SQL insert statement of schema migrationKoichi ITO2016-12-231-4/+4
| | | | | | | | |
* | | | | | | | | [ci skip] Retouch some association wording.Kasper Timm Hansen2016-12-311-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trim some needless words off the lines and format the code sample like we'd write in the Rails source.
* | | | | | | | | [ci skip] Remove mention of GeneratedAssociationMethodsKasper Timm Hansen2016-12-311-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marked as private in 2afe5a1 and doesn't seem worth it to mention the module name here.
* | | | | | | | | Merge pull request #27521 from ↵Kasper Timm Hansen2016-12-311-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/mark-one-more-constant-as-private Mark :GeneratedAssociationMethods also as private_constant
| * | | | | | | | | Mark :GeneratedAssociationMethods also as private_constantPrathamesh Sonpatki2016-12-311-0/+2
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - After https://github.com/rails/rails/commit/64e5b897ac944a05a33275e3828a3d4047a6b457, only :GeneratedAssociationMethods was remaining to be marked as private constant, so marked it as well. - Before: >> User.constants(false) => [:GeneratedAssociationMethods] - After: >> User.constants(false) => []
* | | | | | | | | Merge pull request #27523 from maclover7/jm-2017Jon Moss2016-12-3117-17/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Bump license years for 2017
| * | | | | | | | | Bump license years for 2017Jon Moss2016-12-3117-17/+17
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per https://www.timeanddate.com/counters/firstnewyear.html, it's already 2017 in a lot of places, so we should bump the Rails license years to 2017. [ci skip]
* | | | | | | | | Merge pull request #27522 from ↵Kasper Timm Hansen2016-12-312-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/remove_skip_bundle_option_from_plugin_generator remove `skip_bundle` option from plugin generator
| * | | | | | | | remove `skip_bundle` option from plugin generatoryuuji.yaginuma2016-12-312-3/+3
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because `bundle install` is not executed regardless of whether the option is specified or not. Ref: fbd1e98cf983572ca9884f17f933ffe92833632a
* | | | | | | | Merge pull request #12509 from eitoball/pluralize_for_non_ascii_character_wordsMatthew Draper2016-12-311-0/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ActiveSupport::Inflector.pluralize behavior for words that consist of non-ASCII characters (test only; the original bug was fixed by 1bf50badd943e684a56a03392ef0ddafefca0ad7)
| * | | | | | | | fix pluralize behavior for words that consist of non-ascii charactersEito Katagiri2015-07-022-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code below returns "猫" in 3.2, but "猫s" in 4.0. ```ruby ActiveSupport::Inflector.inflections do |inflect| inflect.uncountable "猫" end "猫".pluralize ```
* | | | | | | | | Prefer Regexp#match? over Regexp#===Matthew Draper2016-12-311-1/+2
| | | | | | | | |
* | | | | | | | | Only add regexes for the new wordsMatthew Draper2016-12-311-2/+3
| | | | | | | | |
* | | | | | | | | Merge pull request #27518 from maclover7/jm-ar-changelog-2Jon Moss2016-12-301-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add missing word in activerecord/CHANGELOG.md
| * | | | | | | | | Add missing word in activerecord/CHANGELOG.mdJon Moss2016-12-301-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Mark internal cache constants as privateMatthew Draper2016-12-311-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #14640
* | | | | | | | | Enforce middleware ordering with a test, instead of commentsMatthew Draper2016-12-312-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want the actual order to be very predictable, so it's rightly defined in code -- not with an on-the-fly tsort. But we can do the tsort here, and then verify that it matches the implemented ordering. This way we don't leave future readers guessing which parts of the ordering are deliberate and which are arbitrary.
* | | | | | | | | Merge pull request #27515 from ↵Matthew Draper2016-12-312-3/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kbrock/fix_log_remote_ip_before_dispatcher_ips_settings Allow log remote ip addres when config.action_dispatch.trusted_proxie…
| * | | | | | | | | Allow log remote ip addres when config.action_dispatch.trusted_proxies passedLeonid Batizhevsky2016-12-302-2/+3
|/ / / / / / / / /
* | | | | | | | | Merge pull request #27512 from ↵Rafael França2016-12-301-3/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/remove_needless_activesupport_deprecation_silence Remove needless `ActiveSupport::Deprecation.silence`
| * | | | | | | | | Remove needless `ActiveSupport::Deprecation.silence`Ryuta Kamizono2016-12-311-3/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #27509 from kamipo/remove_remaining_deprecationsRafael França2016-12-309-58/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Remove remaining ActiveRecord deprecations
| * | | | | | | | Remove deprecated `#uniq`, `#uniq!`, and `#uniq_value`Ryuta Kamizono2016-12-307-46/+5
| | | | | | | | |
| * | | | | | | | Remove deprecated `#insert_sql`, `#update_sql`, and `#delete_sql`Ryuta Kamizono2016-12-303-12/+4
|/ / / / / / / /
* | | | | | | | Merge pull request #27506 from maclover7/jm-ar-changelogJon Moss2016-12-291-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Grammar linting in activerecord/CHANGELOG.md
| * | | | | | | | Grammar linting in activerecord/CHANGELOG.mdJon Moss2016-12-291-5/+5
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge pull request #27504 from kenta-s/fix-grammar-in-ar-changelogJon Moss2016-12-291-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix grammar in AR CHANGELOG.md [ci skip]
| * | | | | | | | Fix grammar in AR CHANGELOG.md [ci skip]kenta-s2016-12-301-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #27503 from rails/activerecord-deprecationRafael França2016-12-2966-650/+329
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove all ActiveRecord deprecations
| * | | | | | | | Delayed job doesn't support Active Record 5.1 yetRafael Mendonça França2016-12-291-1/+2
| | | | | | | | |
| * | | | | | | | Remove deprecated #use_transactional_fixtures configurationRafael Mendonça França2016-12-293-31/+5
| | | | | | | | |
| * | | | | | | | Remove deprecated `#raise_in_transactional_callbacks` configurationRafael Mendonça França2016-12-292-10/+4
| | | | | | | | |
| * | | | | | | | Remove deprecated #load_schema_forRafael Mendonça França2016-12-292-8/+4
| | | | | | | | |
| * | | | | | | | Remove deprecated conditions parameter from #delete_allRafael Mendonça França2016-12-293-26/+12
| | | | | | | | |
| * | | | | | | | Remove deprecated conditions parameter from `#destroy_all`Rafael Mendonça França2016-12-293-16/+6
| | | | | | | | |
| * | | | | | | | Remove deprecated support to passing arguments to `#select` when a block is ↵Rafael Mendonça França2016-12-293-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provided.
| * | | | | | | | Remove deprecated support to query using commas on LIMITRafael Mendonça França2016-12-294-37/+9
| | | | | | | | |
| * | | | | | | | Remove deprecated support to passing a class as a value in a queryRafael Mendonça França2016-12-294-40/+4
| | | | | | | | |