aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* activerecord: Fix identity for sum of strings3-2-stable-for-hmnoHarald Eilertsen2019-08-061-1/+1
|
* Remove `DEFAULT NULL` for primary key column to support MySQL 5.7.3Yasuo Honda2017-01-173-7/+7
| | | | | | Since MySQL 5.7.3 m13 does now allow primary key column is null. (cherry picked from commit b6655885ef13cf8d1705dc9b5232846f0207febd)
* Tweak conditionals on YAML handlingAndrew White2016-11-031-2/+2
| | | | | There's no YAML::ENGINE constant in Ruby 1.8 and Ruby 2.2+ but the former still needs to use the deprecated Syck behavior.
* Remove migration constants to avoid method redefined warningsAndrew White2016-11-031-0/+4
|
* Remove unused local variableAndrew White2016-11-031-1/+0
|
* Fix uninitialized warning with @new_record instance variableAndrew White2016-11-031-0/+1
| | | | | Initializing @stale_state to nil when an association is built fixes a marshalling error - see #5268 for more details.
* Fix indentingAndrew White2016-11-021-6/+6
|
* Only override to_yaml if YAML::ENGINE is definedAndrew White2016-11-021-14/+16
| | | | | The Syck engine has been removed from later versions of Ruby so no need to override to_yaml for these versions.
* Fix File.exists? deprecation warnings in Active RecordAndrew White2016-11-024-21/+21
|
* Fix raising uniqueness constraints in newer versions of SQLiteAndrew White2016-11-021-1/+5
| | | | | Versions 3.8.2 and later of SQLite changed the formatting of the error messages returned when a uniqueness constraint was violated.
* Fix deprecation warnings on URI.unescapeAndrew White2016-11-021-1/+2
|
* Fix warning about unset I18n.enforce_available_localesAndrew White2016-11-021-0/+3
|
* bumping versionAaron Patterson2016-09-141-1/+1
|
* Merge branch '3-2-22-3' into 3-2-stableAaron Patterson2016-08-111-1/+1
|\ | | | | | | | | | | * 3-2-22-3: bumping version Include missing module in tag_helper
| * bumping versionAaron Patterson2016-08-111-1/+1
| |
* | Merge branch '3-2-22-3' into 3-2-stableAaron Patterson2016-08-111-1/+1
|\| | | | | | | | | | | * 3-2-22-3: bumping version ensure tag/content_tag escapes " in attribute vals
| * bumping versionAaron Patterson2016-08-101-1/+1
| |
* | Associations do not call `.to_proc` on HashTyler Distad2016-05-164-3/+9
|/ | | | Fixes #25010
* Preparing for 3.2.22.2 releaseRafael Mendonça França2016-02-291-1/+1
|
* Use Ruby 1.8 compat syntax in test of security fix in ↵Josef Šimánek2016-01-261-4/+4
| | | | activerecord/test/cases/nested_attributes_test.rb.
* bumping versionAaron Patterson2016-01-251-1/+1
|
* Don't short-circuit reject_if procAndrew White2016-01-222-2/+25
| | | | | | | | | | | | | When updating an associated record via nested attribute hashes the reject_if proc could be bypassed if the _destroy flag was set in the attribute hash and allow_destroy was set to false. The fix is to only short-circuit if the _destroy flag is set and the option allow_destroy is set to true. It also fixes an issue where a new record wasn't created if _destroy was set and the option allow_destroy was set to false. CVE-2015-7577
* Preparing for 3.2.22 releaseRafael Mendonça França2015-06-162-1/+6
|
* Fix ruby 2.2 comparable warningsJoey Geiger2015-01-291-1/+1
| | | | | Check for correct value type in activerecord/fixtures.rb Check that zone can respond to expected values to make the comparison.
* use self.method syntax to resolve circular argument issuesAman Gupta2015-01-021-4/+4
|
* fix ruby 2.2 warning: circular argument referenceAman Gupta2014-12-221-4/+4
|
* bumping version for relesaseAaron Patterson2014-11-161-1/+1
|
* bumping version to 3.2.20Aaron Patterson2014-10-291-1/+1
|
* Preparing for 3.2.19 releaseRafael Mendonça França2014-07-022-1/+10
|
* Check against bit string values using multiline regexpRafael Mendonça França2014-07-022-3/+8
| | | | Fix CVE-2014-3482.
* Merge branch '3-2-sec' into 3-2-stableRafael Mendonça França2014-05-062-1/+16
|\ | | | | | | | | Conflicts: actionpack/CHANGELOG.md
| * Preparing for 3.2.18 releaseRafael Mendonça França2014-05-062-1/+16
| |
* | Merge branch '3-2-17' into 3-2-stableRafael Mendonça França2014-02-181-1/+1
|\| | | | | | | | | Conflicts: actionpack/CHANGELOG.md
| * Preparing for 3.2.17 releaseRafael Mendonça França2014-02-181-1/+1
| |
* | Update Session Store DocumentationChris Maddox2013-12-131-1/+1
|/ | | session_id doesn't need to be a text column, just string (VARCHAR)
* updating the changelogAaron Patterson2013-12-021-1/+1
|
* updating changelogsAaron Patterson2013-10-161-1/+1
|
* bumping to 3.2.15Aaron Patterson2013-10-151-1/+1
|
* bumping to rc3Aaron Patterson2013-10-111-1/+1
|
* Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"Rafael Mendonça França2013-10-104-10/+2
| | | | | | | | | This reverts commit ccd11d58910059f07b28cc518dbdad42cbc8ea0c, reversing changes made to 54c05acdba138f3a7a3d44dfc922b0fe4e4cf554. Reason: This caused a regression when the associated record is created in a before_create callback. See https://github.com/rails/rails/pull/12413#issuecomment-25848163
* Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target"Rafael Mendonça França2013-10-102-14/+0
| | | | | | | | | | This reverts commit 7ed5bdc834479c39e3b0ad5a38bcffe27983c10d, reversing changes made to 31c79e291f42b1d862df06c552fe002864aae705. Reason: this caused a regression when the associated record is creted in a before_create callback. See https://github.com/rails/rails/pull/12413#issuecomment-25848163
* bumping to rc2Aaron Patterson2013-10-041-1/+1
|
* Merge pull request #12443 from arthurnn/add_inverse_of_add_targetRafael Mendonça França2013-10-042-0/+14
| | | | Add inverse of add target
* bumping version to 3.2.15.rc1Aaron Patterson2013-10-031-2/+2
|
* Merge pull request #12084 from Ben-M/3-2-stableAaron Patterson2013-10-033-1/+11
|\ | | | | Fix STI scopes using benolee's suggestion. Fixes #11939
| * Fix STI scopes using benolee's suggestion. Fixes #11939Ben Maraney2013-08-303-1/+11
| |
* | Move set_inverse_instance to association.build_recordArthur Neves2013-09-304-2/+10
| | | | | | | | [fixes #10371]
* | fix inverse_of when find_or_initialize_by_*Arthur Neves2013-09-263-4/+22
| | | | | | | | | | inverse_of relation was not being set when calling find_or_initialize_by_ and the entry was found on the db.
* | on tests: dont always touch firm on validateArthur Neves2013-09-252-2/+5
| |
* | Merge pull request #12359 from arthurnn/inverse_on_callbacksRafael Mendonça França2013-09-254-1/+18
| | | | | | | | | | | | | | Make sure inverse_of is visible on the has_many callbacks Conflicts: activerecord/CHANGELOG.md activerecord/test/models/company.rb