aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | :speak_no_evil: :warning:Akira Matsuda2016-02-012-2/+6
| | | | | |
* | | | | | Merge pull request #23360 from kamipo/oid_money_precision_is_unusedRafael França2016-01-312-8/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | `OID::Money.precision` is unused since #15239
| * | | | | | `OID::Money.precision` is unused since #15239Ryuta Kamizono2016-01-312-8/+0
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | p PostgreSQLAdapter::OID::Money.precision # => 19 p PostgreSQLAdapter::OID::Money.new.precision # => nil
* | | | | | Merge pull request #23388 from prathamesh-sonpatki/update-gemfile-lockRafael França2016-01-311-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update Gemfile.lock
| * | | | | | Update Gemfile.lockPrathamesh Sonpatki2016-02-011-1/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | - Leftover from https://github.com/rails/rails/commit/93abf58787396661230f31c7a2f58c18f30dbec9.
* | | | | | Merge pull request #23380 from ↵Arthur Nogueira Neves2016-01-311-8/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | yui-knk/override_calculate_constructables_at_each_concrete_class Remove `case macro` from `calculate_constructable`
| * | | | | | Remove `case macro` from `calculate_constructable`yui-knk2016-02-011-8/+13
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails has abstract Reflection classes (`MacroReflection`, `AssociationReflection` etc.) and concrete Reflection classes (e.g. `HasManyReflection`, `HasOneReflection` etc.). In many case `calculate_constructable` returns `true`, so change `calculate_constructable` to always return `true` and override this method if necessary.
* | | | | | Merge pull request #23387 from mcfiredrill/clarify-touching-callbacksKasper Timm Hansen2016-01-311-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | clarify the touch true option does not trigger after_save/update [ci skip]
| * | | | | | clarify the touch true option does not trigger after_save/update [ci skip]Tony Miller2016-02-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've gotten tripped up more than a few times on this, thinking that using `belongs_to` with `touch: true` would trigger my after_save or after_update callbacks. The same text is in the documentation for the touch method itself, but I think its helpful to repeat it again here. It might save people some time.
* | | | | | | Merge pull request #23370 from maclover7/actioncable-main-travis-buildGuillermo Iguaran2016-01-312-10/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Move Action Cable back to the main build
| * | | | | | | Remove unused methodJon Moss2016-01-311-9/+0
| | | | | | | |
| * | | | | | | Move Action Cable back to the main buildJon Moss2016-01-301-1/+0
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #22857 from bdewater/interlock-docVipul A M2016-02-014-8/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update middleware docs regarding ActionDispatch::LoadInterlock [ci skip]
| * | | | | | | Update middleware docs regarding ActionDispatch::LoadInterlock [ci skip]Bart de Water2016-01-314-9/+10
| | | | | | | |
* | | | | | | | Merge pull request #23169 from y-yagi/rake_proxy_in_engineKasper Timm Hansen2016-01-316-40/+127
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | make rake proxy work in rails engines
| * | | | | | | | make rake proxy work in rails enginesyuuji.yaginuma2016-01-316-40/+127
| | | | | | | | |
* | | | | | | | | Merge pull request #23379 from ↵Kasper Timm Hansen2016-01-311-22/+25
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | yui-knk/define_association_class_on_each_concrete_class Each concrete classes have responsibility to return `association_class`
| * | | | | | | | Each concrete classes have responsibility to return `association_class`yui-knk2016-01-311-22/+25
| | | | | | | | |
* | | | | | | | | Drop the runtime dependency on coffee-railsMatthew Draper2016-02-011-1/+0
| | | | | | | | |
* | | | | | | | | Wrangle the asset build into something that sounds more generalMatthew Draper2016-02-0118-17/+51
| | | | | | | | |
* | | | | | | | | Merge pull request #23369 from maclover7/actioncable-assets-reduxMatthew Draper2016-02-0111-7/+49
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Action Cable Assets Compilation redux
| * | | | | | | | | Add Action Cable asset building as release stepJon Moss2016-01-301-0/+1
| | | | | | | | | |
| * | | | | | | | | Improvements and reorganization of assetsJon Moss2016-01-3010-3/+10
| | | | | | | | | |
| * | | | | | | | | Add task to create precompiled action_cable.js and reorganize to accommodateJavan Makhmali2016-01-3010-7/+41
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #23368 from ↵Santiago Pastorino2016-01-311-3/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/remove_backward_compatibility_code_for_minitest_4 remove backward compatibility code for Minitest 4
| * | | | | | | | | remove backward compatibility code for Minitest 4yuuji.yaginuma2016-01-301-3/+0
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The master branch is required Ruby 2.2.2+, for the Ruby 2.2 is bundled Minitest 5.4.3, I think backward compatibility code for Minitest 4 is unnecessary.
* | | | | | | | | Wait for EventMachine to finish startingMatthew Draper2016-02-011-0/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #23371 from kamipo/remove_odd_backtickVipul A M2016-01-311-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Remove odd ` [ci skip]
| * | | | | | | Remove odd ` [ci skip]Ryuta Kamizono2016-01-311-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #23366 from maclover7/add-configuation-ar-docsJon Moss2016-01-301-0/+102
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Add configuration section to "Active Record Basics" guide
| * | | | | | Add configuration section to "Active Record Basics" guideJon Moss2016-01-301-0/+102
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to fill in some missing information as apart of #22931. It's on purpose that the sample `Message` model inherits from `ActiveRecord::Base` -- Active Record is not meant to be coupled to Rails, and we can't guarantee that users outside of the Rails world will have an `ApplicationRecord` class that inherits from `ActiveRecord::Base`. [ci skip]
* | | | | | Merge pull request #23364 from maclover7/fix-23358Jon Moss2016-01-301-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Small cleanup to Testing Guide
| * | | | | | Small cleanup to Testing GuideJon Moss2016-01-301-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - inbuilt --> built-in - Remove random spaces from code examples [ci skip]
* | | | | | Merge pull request #23358 from vipulnsward/testing-guide-pass-3Vipul A M2016-01-311-19/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | Pass 3 over testing guide
| * | | | | | Pass 3 over testing guideVipul A M2016-01-311-19/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Various grammar fixes - Added assertions for update controller action tests - Added user helper tests - Fix typos [ci skip]
* | | | | | | Merge pull request #23363 from pra85/patch-1Vipul A M2016-01-311-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | typo fix [ci skip]
| * | | | | | | typo fix [ci skip] Prayag Verma2016-01-311-1/+1
|/ / / / / / / | | | | | | | | | | | | | | Spelling mistake - direcotry > directory
* | | | | | | Merge pull request #23362 from vipulnsward/20821-save-doc-updateJon Moss2016-01-301-3/+3
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | - Updated persistence documentation to make it clear that save and sa…
| * | | | | | - Updated persistence documentation to make it clear that save and save! ↵Vipul A M2016-01-311-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | won't update a record if validation fails. - Also fixed `update` method's documention to be uniform about this statement. Fixes #20821 [ci skip] [Vipul A M & pseidemann ]
* | | | | | Revert "Merge pull request #23346 from kamipo/refactor_oid_money_precision"Rafael Mendonça França2016-01-302-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ff835f90800a3e4122d64606cb328908c2e0e071, reversing changes made to c4d85dfbc71043e2a746acd310e32f4f04db801a. Reason: This broke the tests. We will add back after investigated.
* | | | | | Merge pull request #23345 from ↵Rafael França2016-01-302-0/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | yui-knk/warning_when_composite_primary_key_is_detected Warn if `AR.primary_key` is called for a table who has composite prim…
| * | | | | | Warn if `AR.primary_key` is called for a table who has composite primary keyyui-knk2016-01-302-0/+13
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `AR.primary_key` is called for a table who has composite primary key, the method returns `nil`. This behavior sometimes generates invalid SQL. The first time developers notice to invalid SQL is when they execute SQL. This commit enables developers to know they are doing something dangerous as soon as possible.
* | | | | | Merge pull request #23349 from kamipo/refactor_column_existsRafael França2016-01-301-7/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Refactor `column_exists?` in `SchemaStatements`
| * | | | | | Refactor `column_exists?` in `SchemaStatements`Ryuta Kamizono2016-01-301-7/+8
| |/ / / / /
* | | | | | Merge pull request #23355 from kamipo/fix_bigint_for_enum_columnsRafael França2016-01-303-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix `bigint?` for Enum columns in MySQL
| * | | | | | Fix `bigint?` for Enum columns in MySQLRyuta Kamizono2016-01-313-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to #22896.
* | | | | | | Merge pull request #23350 from kamipo/refactor_schema_migration_drop_tableRafael França2016-01-301-4/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make `SchemaMigration.drop_table` to one SQL
| * | | | | | | Make `SchemaMigration.drop_table` to one SQLRyuta Kamizono2016-01-301-4/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | `SchemaMigration.drop_table` is only used in tests. Simply we can use `drop_table if_exists: true`.
* | | | | | | Merge pull request #23352 from yui-knk/move_test_conditionsRafael França2016-01-301-11/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | There is no need to define test if a connection does not support prim…
| * | | | | | | There is no need to define test if a connection does not support primary_keyyui-knk2016-01-311-11/+9
| | |/ / / / / | |/| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 09:30:50 +0000