aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Remove unused 1:1 association :remote optionChris Griego2014-07-161-1/+1
* Merge pull request #16196 from yahonda/mysql_restrict_testMatthew Draper2014-07-172-8/+6
|\
| * Revert "Rename to test_mysql_strict_mode_disabled_dont_override_global_sql_mode"Yasuo Honda2014-07-172-8/+6
* | Merge pull request #15944 from seuros/uuidRafael Mendonça França2014-07-163-1/+51
|\ \
| * | Treat invalid uuid as nilAbdelkader Boudih2014-07-143-1/+51
* | | Merge pull request #16183 from goddamnhippie/fix-psych-warningRafael Mendonça França2014-07-162-0/+6
|\ \ \
| * | | Move #encode_with to RelationGustavo Beathyate2014-07-152-4/+5
| * | | Implement required #encode_withGustavo Beathyate2014-07-152-0/+5
* | | | Merge pull request #15718 from chancancode/regression_from_15694Godfrey Chan2014-07-162-1/+10
|\ \ \ \
| * | | | Fixed a regression introduced in 84cf156Godfrey Chan2014-06-142-1/+10
* | | | | nodoc enum hooks [ci skip]Rafael Mendonça França2014-07-161-2/+2
* | | | | we intend to keep the `capture` helper for Active Record tests.Yves Senn2014-07-161-18/+12
* | | | | Active Record tests still depend on `capture`. Let's keep it for now.Yves Senn2014-07-162-19/+23
* | | | | use foreign key DSL in our tests.Yves Senn2014-07-162-5/+4
* | | | | Merge pull request #16138 from sgrif/sg-attribute-set-keyYves Senn2014-07-163-10/+10
|\ \ \ \ \
| * | | | | AttributeSet#include? -> AttributeSet#key?Sean Griffin2014-07-113-10/+10
* | | | | | Move uuid_v5 and uuid_v3 to Digest::UUIDRafael Mendonça França2014-07-151-2/+2
* | | | | | Merge pull request #16180 from rafaelfranca/rm-dirtyRafael Mendonça França2014-07-152-4/+16
|\ \ \ \ \ \
| * | | | | | Deprecate `reset_#{attribute}` in favor of `restore_#{attribute}`.Rafael Mendonça França2014-07-151-2/+14
| * | | | | | Deprecate ActiveModel::Dirty#reset_changes in favor of #clear_changes_informa...Rafael Mendonça França2014-07-151-2/+2
* | | | | | | Keep quietly and capture undeprecated on your suiteRafael Mendonça França2014-07-152-0/+29
* | | | | | | Merge branch 'master' of git://github.com/rails/railsGodfrey Chan2014-07-154-6/+24
|\| | | | | |
| * | | | | | Merge branch 'jbrowning-fix_mariadb_rename_index'Rafael Mendonça França2014-07-154-6/+24
| |\ \ \ \ \ \
| | * | | | | | Predicate methods don't need to return `true` / `false`Rafael Mendonça França2014-07-151-1/+1
| | * | | | | | Fix version detection for RENAME INDEX support. Fixes #15931.Jeff Browning2014-07-154-6/+24
* | | | | | | | Document the change in `nil` handling for serialized attributesGodfrey Chan2014-07-151-9/+12
* | | | | | | | Fixed SQL syntax for postgresqlGodfrey Chan2014-07-151-1/+1
* | | | | | | | Merge pull request #16162 from chancancode/fix_json_coderGodfrey Chan2014-07-152-1/+19
* | | | | | | | Revert "Revert "Merge pull request #16059 from jenncoop/json-serialized-attr""Godfrey Chan2014-07-155-2/+76
|/ / / / / / /
* / / / / / / Add CHANGELOG entry for #15266Godfrey Chan2014-07-151-0/+5
|/ / / / / /
* | | | | | Merge pull request #15266 from dv/use_counter_cache_for_empty_callGodfrey Chan2014-07-152-0/+15
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | If a counter_cache exists, use it for #empty?David Verhasselt2014-06-102-0/+15
* | | | | | [CI SKIP] Doc fix.Guo Xiang Tan2014-07-151-2/+2
* | | | | | Merge pull request #16089 from eileencodes/refactor-reflections-from-sub-clas...Aaron Patterson2014-07-143-101/+158
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Begin refactoring ThroughReflectioneileencodes2014-07-083-101/+158
* | | | | | Address ORA-00972: identifier is too long when tested with OracleYasuo Honda2014-07-143-4/+5
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #16127 from Envek/fix_16111Matthew Draper2014-07-143-1/+32
|\ \ \ \ \
| * | | | | Dump PostgreSQL primary key with custom function as a default.Andrey Novikov2014-07-113-1/+32
* | | | | | Fixing typo in commentGregory Igelmund2014-07-121-1/+1
* | | | | | Merge pull request #16136 from sgrif/sg-pg-bit-stringMatthew Draper2014-07-122-13/+33
|\ \ \ \ \ \
| * | | | | | Don't rely on the column SQL type for bit string quotingSean Griffin2014-07-112-13/+33
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #16055 from sgrif/sg-refactor-sqlite3-stringsMatthew Draper2014-07-122-14/+29
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use a type object for type casting behavior on SQLite3Sean Griffin2014-07-112-14/+29
* | | | | | Synced 4.2 release notes with the latest commits.Godfrey Chan2014-07-111-1/+1
| |/ / / / |/| | | |
* | | | | [ci skip] Add changelog for PR #14899eileencodes2014-07-081-0/+15
* | | | | Include fixtures to prevent foreign key violation.Zuhao Wan2014-07-091-0/+2
* | | | | Merge pull request #16093 from zuhao/refactor_activerecord_nested_through_ass...Rafael Mendonça França2014-07-081-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Warm up cache to prevent assertion failure.Zuhao Wan2014-07-081-0/+1
* | | | | Merge pull request #16071 from sgrif/sg-pg-type-castRafael Mendonça França2014-07-081-15/+0
|\ \ \ \ \
| * | | | | Remove PG's definition of `type_cast`Sean Griffin2014-07-061-15/+0
| |/ / / /