aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8740 from amatsuda/missing_source_fileRafael Mendonça França2015-01-023-27/+3
|\ | | | | | | | | | | | | replace use of MissingSourceFile with LoadError Conflicts: activesupport/test/core_ext/load_error_test.rb
| * replace use of MissingSourceFile with LoadErrorAkira Matsuda2013-01-043-19/+4
| |
* | Don't test invalid log encoding against PostgreSQL adapterRafael Mendonça França2015-01-021-4/+6
| | | | | | | | It already treats the message
* | A quick pass through NestedAttributes' doc [ci skip]Robin Dupret2015-01-021-18/+20
| |
* | Revert part of 996e646bd8cff3bcf2b13863439f48d3e744cdae [ci skip]Zachary Scott2015-01-022-3/+1
| |
* | Follow up to #17973 [ci skip]Robin Dupret2015-01-021-9/+10
| |
* | Merge pull request #17822 from kamipo/refactor_visit_change_column_definitionRafael Mendonça França2015-01-024-16/+14
|\ \ | | | | | | Refactor `visit_ChangeColumnDefinition`
| * | Refactor `visit_ChangeColumnDefinition`Ryuta Kamizono2015-01-032-11/+9
| | | | | | | | | | | | `visit_ChangeColumnDefinition` is the same "CHANGE column_name " + `visit_ColumnDefinition(o)`.
| * | Add default value for `create_table_definition`Ryuta Kamizono2015-01-033-5/+5
| | | | | | | | | | | | | | | In most cases, `create_table_definition` called by table_name (the first argument) only.
* | | Merge pull request #8547 from printercu/patch-1Rafael Mendonça França2015-01-022-1/+14
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | fix for messages in invalid encoding from db-drivers Conflicts: activerecord/lib/active_record/connection_adapters/abstract_adapter.rb activerecord/test/cases/connection_adapters/abstract_adapter_test.rb
| * | fix for messages in invalid encoding from db-driversMax Melentiev2013-12-072-1/+14
| | |
* | | Merge pull request #17820 from fw42/restore_query_cache_on_rollbackRafael Mendonça França2015-01-029-9/+53
|\ \ \ | | | | | | | | | | | | Clear query cache on rollback
| * | | Restore query cache on rollbackFlorian Weingarten2014-12-018-9/+49
| | | |
* | | | Merge pull request #15309 from iantropov/issue_12698_build_throughRafael Mendonça França2015-01-024-1/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add setting of FK for throgh associations while building Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/associations/has_many_through_associations_test.rb
| * | | | Add setting of FK for throgh associations while buildingIvan Antropov2014-05-254-1/+29
| | | | |
* | | | | Merge pull request #17978 from kommen/fixed-pr-14903Rafael Mendonça França2015-01-023-4/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure append_info_to_payload is called even if an exception is raised. Conflicts: actionpack/CHANGELOG.md
| * | | | | Ensure append_info_to_payload is called even if an exception is raised.Dieter Komendera2014-12-103-4/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See: * https://github.com/rails/rails/pull/14903 * https://github.com/roidrage/lograge/issues/37 Some code by mxrguspxrt from #14903.
* | | | | | Merge pull request #17974 from killthekitten/fix-render-blockRafael Mendonça França2015-01-025-1/+49
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make possible to use blocks with short version of render partial Conflicts: actionview/CHANGELOG.md
| * | | | | | Make possible to use blocks with short version of render partialNikolay Shebanov2014-12-195-1/+49
| | | | | | |
* | | | | | | Merge pull request #17973 from maurogeorge/file_field_hidden_fieldRafael Mendonça França2015-01-024-5/+58
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Generate a hidden_tag when using a file_field
| * | | | | | | Add a hidden_field on the file_fieldMauro George2015-01-024-5/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will avoid a error be raised when the only input on the form is the `file_field`.
* | | | | | | | Remove thread variables backportRafael Mendonça França2015-01-022-161/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are already present on Ruby 2.2
* | | | | | | | Merge pull request #18228 from kamipo/correctly_dump_primary_keyRafael Mendonça França2015-01-027-5/+69
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve a dump of the primary key support. Conflicts: activerecord/CHANGELOG.md
| * | | | | | | | Improve a dump of the primary key support.Ryuta Kamizono2014-12-297-5/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If it is not a default primary key, correctly dump the type and options.
* | | | | | | | | Remove support to activerecord-deprecated_findersRafael Mendonça França2015-01-0216-130/+64
| | | | | | | | |
* | | | | | | | | Merge pull request #16749 from robin850/rbx-name-errorRafael Mendonça França2015-01-021-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Rely on NameError#name instead of its error message
| * | | | | | | | | Skip an error message related assertion on RubiniusRobin Dupret2014-10-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rubinius' error messages don't call `#inspect` on the concerned object while the assertion is here to address a wrong inspection on MRI with time zones so let's keep this test for now on Rubinius.
* | | | | | | | | | Merge pull request #18067 from ↵Rafael Mendonça França2015-01-026-1/+225
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/format_datetime_string_according_to_precision Format the datetime string according to the precision of the datetime field. Conflicts: activerecord/CHANGELOG.md
| * | | | | | | | | | Format the datetime string according to the precision of the datetime field.Ryuta Kamizono2015-01-024-1/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incompatible to rounding behavior between MySQL 5.6 and earlier. In 5.5, when you insert `2014-08-17 12:30:00.999999` the fractional part is ignored. In 5.6, it's rounded to `2014-08-17 12:30:01`: http://bugs.mysql.com/bug.php?id=68760
| * | | | | | | | | | Allow precision option for MySQL datetimes.Ryuta Kamizono2015-01-026-1/+164
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #15746 from amccloud/auto-inverse_of-in-moduleRafael Mendonça França2015-01-023-1/+17
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed automatic inverse_of for models nested in module Conflicts: activerecord/CHANGELOG.md
| * | | | | | | | | | Fixed automatic inverse_of for models nested in moduleAndrew McCloud2014-06-153-1/+17
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #18298 from brainopia/integration_requests_without_setupRafael Mendonça França2015-01-022-1/+26
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Integration requests should work in contexts without setup and teardown
| * | | | | | | | | | | Integration requests should work in contexts without setup and teardownbrainopia2015-01-022-1/+26
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #11898 from prathamesh-sonpatki/patch-updateRafael Mendonça França2015-01-024-3/+51
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed ActiveRecord::Relation#update behavior so that it will work on Relation objects without giving id Conflicts: activerecord/CHANGELOG.md
| * | | | | | | | | | | | Allow ActiveRecord::Relation#update to run on result of a relation with ↵Prathamesh Sonpatki2014-12-204-3/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | callbacks and validations - Right now, there is no method to update multiple records with validations and callbacks. - Changed the behavior of existing `update` method so that when `id` attribute is not given and the method is called on an `Relation` object, it will execute update for every record of the `Relation` and will run validations and callbacks for every record. - Added test case for validating that the callbacks run when `update` is called on a `Relation`. - Changed test_create_columns_not_equal_attributes test from persistence_test to include author_name column on topics table as it it used in before_update callback. - This change introduces performance issues when a large number of records are to be updated because it runs UPDATE query for every record of the result. The `update_all` method can be used in that case if callbacks are not required because it will only run single UPDATE for all the records.
* | | | | | | | | | | | | Merge pull request #18290 from lucascaton/guides_updatesRafael Mendonça França2015-01-027-19/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | Updating guides for Rails 5.0
| * | | | | | | | | | | | Including links to earlier releases guides (4.1.8 and 4.0.12) [ci skip]Lucas Caton2015-01-021-0/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Using Rails 5.0 in bug report templates [ci skip]Lucas Caton2015-01-022-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Updating guides for Rails 5.0 [ci skip]Lucas Caton2015-01-025-17/+24
| | | | | | | | | | | | |
* | | | | | | | | | | | | Remove warningsCarlos Antonio da Silva2015-01-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warning: ambiguous first argument; put parentheses or a space even after `/' operator'`
* | | | | | | | | | | | | Verify the helper name with plural as it is generatedCarlos Antonio da Silva2015-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks @robin850.
* | | | | | | | | | | | | Add branch to gems pointing to github so that we can use local checkoutsCarlos Antonio da Silva2015-01-021-2/+2
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #18080 from korbin/fix_reaping_frequency_configurationRafael Mendonça França2015-01-023-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue with reaping_frequency type.
| * | | | | | | | | | | | fix issue with reaping_frequency typekorbin2014-12-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using DATABASE_URL to configure ActiveRecord, :reaping_frequency does not get converted from a string to a numeric value. This value is eventually passed to 'sleep' and must be numeric to avoid exceptions. This commit converts :reaping_frequency to a float when present.
* | | | | | | | | | | | | Do not check only for the Rails constantRafael Mendonça França2015-01-023-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This constant may be define for auxiliar gems like rails-html-sanitizer and these methods call will fail.
* | | | | | | | | | | | | Do not run integration tests for the test adapterRafael Mendonça França2015-01-021-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #18288 from claudiob/add-skip-action-mailerRafael Mendonça França2015-01-0110-4/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add --skip-action-mailer (or -M) to rails generate
| * | | | | | | | | | | | | Add --skip-action-mailer (or -M) to rails generateclaudiob2015-01-0110-4/+75
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Fix scaffold generator with --helper=false optionRafael Mendonça França2015-01-012-0/+15
| | | | | | | | | | | | |