Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Tweak conditionals on YAML handling | Andrew White | 2016-11-03 | 1 | -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 warnings | Andrew White | 2016-11-03 | 1 | -0/+4 |
| | |||||
* | Remove unused local variable | Andrew White | 2016-11-03 | 1 | -1/+0 |
| | |||||
* | Fix uninitialized warning with @new_record instance variable | Andrew White | 2016-11-03 | 1 | -0/+1 |
| | | | | | Initializing @stale_state to nil when an association is built fixes a marshalling error - see #5268 for more details. | ||||
* | Fix indenting | Andrew White | 2016-11-02 | 1 | -6/+6 |
| | |||||
* | Only override to_yaml if YAML::ENGINE is defined | Andrew White | 2016-11-02 | 1 | -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 Record | Andrew White | 2016-11-02 | 4 | -21/+21 |
| | |||||
* | Fix raising uniqueness constraints in newer versions of SQLite | Andrew White | 2016-11-02 | 1 | -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.unescape | Andrew White | 2016-11-02 | 1 | -1/+2 |
| | |||||
* | Fix warning about unset I18n.enforce_available_locales | Andrew White | 2016-11-02 | 1 | -0/+3 |
| | |||||
* | bumping version | Aaron Patterson | 2016-09-14 | 1 | -1/+1 |
| | |||||
* | Merge branch '3-2-22-3' into 3-2-stable | Aaron Patterson | 2016-08-11 | 1 | -1/+1 |
|\ | | | | | | | | | | | * 3-2-22-3: bumping version Include missing module in tag_helper | ||||
| * | bumping version | Aaron Patterson | 2016-08-11 | 1 | -1/+1 |
| | | |||||
* | | Merge branch '3-2-22-3' into 3-2-stable | Aaron Patterson | 2016-08-11 | 1 | -1/+1 |
|\| | | | | | | | | | | | * 3-2-22-3: bumping version ensure tag/content_tag escapes " in attribute vals | ||||
| * | bumping version | Aaron Patterson | 2016-08-10 | 1 | -1/+1 |
| | | |||||
* | | Associations do not call `.to_proc` on Hash | Tyler Distad | 2016-05-16 | 4 | -3/+9 |
|/ | | | | Fixes #25010 | ||||
* | Preparing for 3.2.22.2 release | Rafael Mendonça França | 2016-02-29 | 1 | -1/+1 |
| | |||||
* | Use Ruby 1.8 compat syntax in test of security fix in ↵ | Josef Šimánek | 2016-01-26 | 1 | -4/+4 |
| | | | | activerecord/test/cases/nested_attributes_test.rb. | ||||
* | bumping version | Aaron Patterson | 2016-01-25 | 1 | -1/+1 |
| | |||||
* | Don't short-circuit reject_if proc | Andrew White | 2016-01-22 | 2 | -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 release | Rafael Mendonça França | 2015-06-16 | 2 | -1/+6 |
| | |||||
* | Fix ruby 2.2 comparable warnings | Joey Geiger | 2015-01-29 | 1 | -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 issues | Aman Gupta | 2015-01-02 | 1 | -4/+4 |
| | |||||
* | fix ruby 2.2 warning: circular argument reference | Aman Gupta | 2014-12-22 | 1 | -4/+4 |
| | |||||
* | bumping version for relesase | Aaron Patterson | 2014-11-16 | 1 | -1/+1 |
| | |||||
* | bumping version to 3.2.20 | Aaron Patterson | 2014-10-29 | 1 | -1/+1 |
| | |||||
* | Preparing for 3.2.19 release | Rafael Mendonça França | 2014-07-02 | 2 | -1/+10 |
| | |||||
* | Check against bit string values using multiline regexp | Rafael Mendonça França | 2014-07-02 | 2 | -3/+8 |
| | | | | Fix CVE-2014-3482. | ||||
* | Merge branch '3-2-sec' into 3-2-stable | Rafael Mendonça França | 2014-05-06 | 2 | -1/+16 |
|\ | | | | | | | | | Conflicts: actionpack/CHANGELOG.md | ||||
| * | Preparing for 3.2.18 release | Rafael Mendonça França | 2014-05-06 | 2 | -1/+16 |
| | | |||||
* | | Merge branch '3-2-17' into 3-2-stable | Rafael Mendonça França | 2014-02-18 | 1 | -1/+1 |
|\| | | | | | | | | | Conflicts: actionpack/CHANGELOG.md | ||||
| * | Preparing for 3.2.17 release | Rafael Mendonça França | 2014-02-18 | 1 | -1/+1 |
| | | |||||
* | | Update Session Store Documentation | Chris Maddox | 2013-12-13 | 1 | -1/+1 |
|/ | | | session_id doesn't need to be a text column, just string (VARCHAR) | ||||
* | updating the changelog | Aaron Patterson | 2013-12-02 | 1 | -1/+1 |
| | |||||
* | updating changelogs | Aaron Patterson | 2013-10-16 | 1 | -1/+1 |
| | |||||
* | bumping to 3.2.15 | Aaron Patterson | 2013-10-15 | 1 | -1/+1 |
| | |||||
* | bumping to rc3 | Aaron Patterson | 2013-10-11 | 1 | -1/+1 |
| | |||||
* | Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build" | Rafael Mendonça França | 2013-10-10 | 4 | -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ça | 2013-10-10 | 2 | -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 rc2 | Aaron Patterson | 2013-10-04 | 1 | -1/+1 |
| | |||||
* | Merge pull request #12443 from arthurnn/add_inverse_of_add_target | Rafael Mendonça França | 2013-10-04 | 2 | -0/+14 |
| | | | | Add inverse of add target | ||||
* | bumping version to 3.2.15.rc1 | Aaron Patterson | 2013-10-03 | 1 | -2/+2 |
| | |||||
* | Merge pull request #12084 from Ben-M/3-2-stable | Aaron Patterson | 2013-10-03 | 3 | -1/+11 |
|\ | | | | | Fix STI scopes using benolee's suggestion. Fixes #11939 | ||||
| * | Fix STI scopes using benolee's suggestion. Fixes #11939 | Ben Maraney | 2013-08-30 | 3 | -1/+11 |
| | | |||||
* | | Move set_inverse_instance to association.build_record | Arthur Neves | 2013-09-30 | 4 | -2/+10 |
| | | | | | | | | [fixes #10371] | ||||
* | | fix inverse_of when find_or_initialize_by_* | Arthur Neves | 2013-09-26 | 3 | -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 validate | Arthur Neves | 2013-09-25 | 2 | -2/+5 |
| | | |||||
* | | Merge pull request #12359 from arthurnn/inverse_on_callbacks | Rafael Mendonça França | 2013-09-25 | 4 | -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 key | Eugene Kalenkovich | 2013-09-12 | 3 | -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 given | Arthur Neves | 2013-09-09 | 1 | -2/+2 |
|/ |