aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Fix FinderMethods#last unscoped primary keyEugene Kalenkovich2013-09-123-2/+21
| | | | | | | | | | | | | | | | Fixes table.joins(:relation).last(N) breaking on sqlite Conflicts: activerecord/CHANGELOG.md activerecord/test/cases/finder_test.rb
* | on SchemaCache use the connection getter instead of the obj givenArthur Neves2013-09-091-2/+2
|/
* Load fixtures from linked foldersKassio Borges2013-08-054-3/+8
|
* Fix broken testRafael Mendonça França2013-07-241-1/+1
| | | | quote_value is called on the object not the class
* Tidy up the "Specified column type for quote_value" changesBen Woosley2013-07-242-3/+3
| | | | | | | | | | This includes fixing typos in changelog, removing a deprecated mocha/setup test require, and preferring the `column_for_attribute` accessor over direct access to the columns_hash in the new code. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/locking/optimistic.rb
* Specified column type for quote_valueAlfred Wong2013-07-243-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | When calling quote_value the underlying connection sometimes requires more information about the column to properly return the correct quoted value. I ran into this issue when using optimistic locking in JRuby and the activerecord-jdbcmssql-adapter. In SQLSever 2000, we aren't allowed to insert a integer into a NVARCHAR column type so we need to format it as N'3' if we want to insert into the NVARCHAR type. Unfortuantely, without the column type being passed the connection adapter cannot properly return the correct quote value because it doesn't know to return N'3' or '3'. This patch is fairly straight forward where it just passes in the column type into the quote_value, as it already has the ability to take in the column, so it can properly handle at the connection level. I've added the tests required to make sure that the quote_value method is being passed the column type so that the underlying connection can determine how to quote the value. Conflicts: activerecord/CHANGELOG.md activerecord/lib/active_record/locking/optimistic.rb
* Fix merge error when Equality LHS is non-attribute.90yukke2013-07-233-2/+23
| | | | This is reworking of rails/rails/pull/7380 made for rails 3.
* Preparing for 3.2.14 releaseRafael Mendonça França2013-07-221-1/+1
|
* Update CHANGELOG entryRafael Mendonça França2013-07-221-4/+1
|
* Preparing for 3.2.14.rc2 releaseRafael Mendonça França2013-07-162-3/+3
|
* Use Ruby 1.8 syntaxRafael Mendonça França2013-07-151-1/+1
|
* Merge pull request #11451 from ↵Yves Senn2013-07-153-0/+18
| | | | | | | | jetthoughts/11450_do_not_resave_destroyed_association Do not re-save destroyed association on saving parent object Conflicts: activerecord/lib/active_record/autosave_association.rb
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-26 17:24:17 +0000