aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #29488 from utilum/update_gemfileMatthew Draper2017-06-182-12/+2
|\ | | | | | | Fixes FIXME: rb-inotify 0.99 has been released
| * Fixes FIXME: rb-inotify 0.99 has been releasedutilum2017-06-172-13/+4
|/
* Merge pull request #29487 from utilum/update_feodra_package_nameVipul A M2017-06-171-1/+1
|\ | | | | [ci skip] Update fedora SQLite3 package name
| * [ci skip] Update fedora SQLite3 package nameutilum2017-06-171-1/+1
|/
* Merge pull request #29415 from kamipo/remove_unused_defined_associationGuillermo Iguaran2017-06-162-2/+1
|\ | | | | Remove unused defined association
| * Remove unused defined associationRyuta Kamizono2017-06-112-2/+1
| | | | | | | | | | `belongs_to :developer` on `Comment` model was added in 431f8e0 but it is unused.
* | Merge pull request #29455 from kirs/remove-column-with-fk-mysqlGuillermo Iguaran2017-06-162-0/+17
|\ \ | | | | | | Remove FK together with column in MySQL
| * | Remove FK together with column in MySQLKir Shatrov2017-06-162-0/+17
| | | | | | | | | | | | | | | | | | | | | Unlike with other databses, MySQL doesn't let you remove the column if there's a FK on this column. For better developer experience we want to remove the FK together with the column.
* | | Merge pull request #29392 from alexcameron89/unpersisted_create_associationMatthew Draper2017-06-173-1/+14
|\ \ \ | | | | | | | | Raise on create for singular association when parent is unpersisted
| * | | Raise on create for singular association when parent is unpersistedAlex Kitchens2017-06-083-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | A collection association will raise on `#create_association` when the parent is unpersisted. A singular association should do the same. This addresses issue #29219.
* | | | Merge pull request #29431 from kamipo/fix_create_table_with_query_from_relationMatthew Draper2017-06-172-7/+10
|\ \ \ \ | | | | | | | | | | Fix `create_table` with query from relation
| * | | | Fix `create_table` with query from relationRyuta Kamizono2017-06-132-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | If a relation has binds, `connection.to_sql(relation)` without binds will generate invalid SQL. It should use `relation.to_sql` in that case.
* | | | | Merge pull request #29461 from dnl/unscope_where_orMatthew Draper2017-06-172-1/+26
|\ \ \ \ \ | | | | | | | | | | | | Don't require 'unscope' to be the same on both sides of an 'or' relation
| * | | | | Don't require 'unscope' to be the same for both sides of a 'or' relation.Dan Sherson2017-06-152-1/+26
| | | | | |
* | | | | | Merge pull request #29470 from kamipo/use_nullable_column_instead_of_primary_keyMatthew Draper2017-06-171-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use nullable `id` column instead of a primary key
| * | | | | | Use nullable `id` column instead of a primary keyRyuta Kamizono2017-06-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `id` column in `subscribers` was added as a primary key for ignorable in INSERT. But it caused `NotNullViolation` for oracle-enhanced adapter. https://github.com/rsim/oracle-enhanced/issues/1357 I changed the column to nullable to address the issue.
* | | | | | | Remove references to deprecared raise_runtime_errors from documentation, ↵Vipul A M2017-06-172-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | which is always enabled now. Ref: https://github.com/rails/sprockets-rails/commit/655b93bffc6f51b96a7cc097f9010942693bfaae and https://github.com/rails/rails/pull/24070 . Fixes #29483 [ci skip] (#29484)
* | | | | | | Merge pull request #29482 from Edouard-chin/test-load-pathRafael França2017-06-161-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add the `<app_root>/test` dir to the `$LOAD_PATH` as a string:
| * | | | | | | Add the `<app_root>/test` dir to the `$LOAD_PATH` as a string:Edouard CHIN2017-06-161-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | - [Rails <= 5.0](https://github.com/rails/rails/blob/5-0-stable/railties/lib/rails/commands/test.rb#L6) used to add the `<app_root>/test` as a string; this behaviour changed in rails 5.1, it's appending a `Pathname` object
* | | | | | | Merge pull request #29140 from notEthan/log_subscribed_avoid_rescuingRafael França2017-06-161-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Log subscriber - avoid rescuing certain exceptions
| * | | | | | | check that logger is defined in log subscriber rescue before loggingEthan2017-05-241-1/+3
| | | | | | | |
| * | | | | | | lob subscriber should only rescue StandardError, not ExceptionEthan2017-05-241-1/+1
| | | | | | | |
* | | | | | | | Fix formatting of `ActionMailer::MessageDelivery` doc [ci skip]Ryuta Kamizono2017-06-161-4/+4
| | | | | | | |
* | | | | | | | Merge pull request #29471 from ↵Guillermo Iguaran2017-06-151-0/+16
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | halogenandtoast/mm-mailer-delayed-job-documentation Document setting the delivery_job for ActionMailer [ci skip]
| * | | | | | | Document setting the delivery_job for ActionMailer [ci skip]Matthew Mongeau2017-06-161-0/+16
|/ / / / / / /
* | | | | | | Merge pull request #29447 from shotat/feature/enhance_active_modelRafael França2017-06-151-2/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ActiveModel] Improve the performance of mass assignments
| * | | | | | | add frozen string literal commentshotat2017-06-151-1/+3
| | | | | | | |
| * | | | | | | freeze stringshotat2017-06-141-1/+1
| | | | | | | |
| * | | | | | | enhance active model assignmentshotat2017-06-141-2/+3
| | | | | | | |
* | | | | | | | Merge pull request #29464 from eugeneius/raw_write_attributeRafael França2017-06-152-15/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Don't map id to primary key in raw_write_attribute
| * | | | | | | | Don't map id to primary key in raw_write_attributeEugene Kenny2017-06-152-15/+12
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `raw_write_attribute` method is used to update a record's attributes to reflect the new state of the database in `update_columns`. The hash provided to `update_columns` is turned into an UPDATE query directly, which means passing an `id` key results in an update to the `id` column, even if the model uses a different attribute as its primary key. When updating the record, we don't want to apply the `id` column change to the primary key attribute, since that's not what happened in the query. Without the code to handle this case, `write_attribute_with_type_cast` no longer contains any logic shared between `raw_write_attribute` and `write_attribute`, so we can inline the code into those two methods.
* | | | | | | | Merge pull request #29462 from ↵Rafael França2017-06-152-1/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/fix_dump_schema_information_with_empty_versions Fix `dump_schema_information` with empty versions
| * | | | | | | | Fix `dump_schema_information` with empty versionsRyuta Kamizono2017-06-152-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #29460.
* | | | | | | | | Fix indentation [ci skip]Ryuta Kamizono2017-06-151-6/+7
| | | | | | | | |
* | | | | | | | | Merge pull request #29453 from kamipo/add_test_case_for_28274Guillermo Iguaran2017-06-151-0/+46
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add test cases for #28274
| * | | | | | | | | Add test cases for #28274Ryuta Kamizono2017-06-151-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `object.id` is correctly restored since #29378 has merged. Closes #28274, Closes #28395. [Ryuta Kamizono & Eugene Kenny]
* | | | | | | | | | Merge pull request #29457 from halogenandtoast/mm-configure_delivery_jobGuillermo Iguaran2017-06-154-1/+26
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Allow mailers to configure their delivery job
| * | | | | | | | | Allow mailers to configure their delivery jobMatthew Mongeau2017-06-154-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting delivery_job on a mailer class will cause MessageDelivery to use the specified job instead of ActionMailer::DeliveryJob: class MyMailer < ApplicationMailer self.delivery_job = MyCustomDeliveryJob ... end
* | | | | | | | | | Remove deprecated option from docs [ci skip] (#29459)Vipul A M2017-06-151-6/+6
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #29442 from DmytroVasin/rails-ujs-docsVipul A M2017-06-151-0/+29
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Update `working with javascript` readme to support rails-ujs behaviour. [ci skip]
| * | | | | | | | Updated `working with javascript` readme to support the behavior of rails-ujs.Dmytro Vasin2017-06-151-0/+29
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #29409 from eugeneius/skip_test_uuid_column_defaultRafael França2017-06-151-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Allow `uuid_test.rb` to be loaded on all adapters
| * | | | | | | | Allow `uuid_test.rb` to be loaded on all adaptersEugene Kenny2017-06-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running `bin/test` from the activerecord directory produces this error: test/cases/adapters/postgresql/uuid_test.rb:43:in `<class:PostgresqlUUIDTest>': undefined method `supports_pgcrypto_uuid?' for #<ActiveRecord::ConnectionAdapters::SQLite3Adapter:0x007fc405e72a68> (NoMethodError) The test only actually runs on the PostgreSQL adapter; we can avoid triggering the error on other adapters with this `respond_to?` guard.
* | | | | | | | | Merge pull request #29452 from kamipo/prevent_extra_sync_with_transaction_stateRafael França2017-06-151-5/+2
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Prevent extra `sync_with_transaction_state`
| * | | | | | | | Prevent extra `sync_with_transaction_state`Ryuta Kamizono2017-06-151-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `sync_with_transaction_state` in `to_key` is unneeded because `id` also does.
* | | | | | | | | Merge pull request #29451 from vipulnsward/29441-flatten-defaultRafael França2017-06-142-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Allow translate default option to accept an array similar to i18n.t
| * | | | | | | | Allow translate default option to accept an array similar to i18n.t. Fixes ↵Vipul A M2017-06-152-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #29441
* | | | | | | | | Merge pull request #29378 from kamipo/avoid_overwriting_id_attribute_methodsRafael França2017-06-144-19/+24
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Avoid overwriting the methods of `AttributeMethods::PrimaryKey`
| * | | | | | | | | Avoid overwriting the methods of `AttributeMethods::PrimaryKey`Ryuta Kamizono2017-06-074-19/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the methods of `AttributeMethods::PrimaryKey` are overwritten by `define_attribute_methods`. It will be broken if a table that customized primary key has non primary key id column. It should not be overwritten if a table has any primary key. Fixes #29350.
* | | | | | | | | | Merge pull request #29417 from ↵Matthew Draper2017-06-1521-26/+26
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | bogdanvlviv/use-require_relative-instead-of_require-with-full-path Use `require_relative` instead of `require` with full path
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 10:59:07 +0000