Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove unused 1:1 association :remote option | Chris Griego | 2014-07-16 | 1 | -1/+1 |
* | Merge pull request #16196 from yahonda/mysql_restrict_test | Matthew Draper | 2014-07-17 | 2 | -8/+6 |
|\ | |||||
| * | Revert "Rename to test_mysql_strict_mode_disabled_dont_override_global_sql_mode" | Yasuo Honda | 2014-07-17 | 2 | -8/+6 |
* | | Merge pull request #15944 from seuros/uuid | Rafael Mendonça França | 2014-07-16 | 3 | -1/+51 |
|\ \ | |||||
| * | | Treat invalid uuid as nil | Abdelkader Boudih | 2014-07-14 | 3 | -1/+51 |
* | | | Merge pull request #16183 from goddamnhippie/fix-psych-warning | Rafael Mendonça França | 2014-07-16 | 2 | -0/+6 |
|\ \ \ | |||||
| * | | | Move #encode_with to Relation | Gustavo Beathyate | 2014-07-15 | 2 | -4/+5 |
| * | | | Implement required #encode_with | Gustavo Beathyate | 2014-07-15 | 2 | -0/+5 |
* | | | | Merge pull request #15718 from chancancode/regression_from_15694 | Godfrey Chan | 2014-07-16 | 2 | -1/+10 |
|\ \ \ \ | |||||
| * | | | | Fixed a regression introduced in 84cf156 | Godfrey Chan | 2014-06-14 | 2 | -1/+10 |
* | | | | | nodoc enum hooks [ci skip] | Rafael Mendonça França | 2014-07-16 | 1 | -2/+2 |
* | | | | | we intend to keep the `capture` helper for Active Record tests. | Yves Senn | 2014-07-16 | 1 | -18/+12 |
* | | | | | Active Record tests still depend on `capture`. Let's keep it for now. | Yves Senn | 2014-07-16 | 2 | -19/+23 |
* | | | | | use foreign key DSL in our tests. | Yves Senn | 2014-07-16 | 2 | -5/+4 |
* | | | | | Merge pull request #16138 from sgrif/sg-attribute-set-key | Yves Senn | 2014-07-16 | 3 | -10/+10 |
|\ \ \ \ \ | |||||
| * | | | | | AttributeSet#include? -> AttributeSet#key? | Sean Griffin | 2014-07-11 | 3 | -10/+10 |
* | | | | | | Move uuid_v5 and uuid_v3 to Digest::UUID | Rafael Mendonça França | 2014-07-15 | 1 | -2/+2 |
* | | | | | | Merge pull request #16180 from rafaelfranca/rm-dirty | Rafael Mendonça França | 2014-07-15 | 2 | -4/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Deprecate `reset_#{attribute}` in favor of `restore_#{attribute}`. | Rafael Mendonça França | 2014-07-15 | 1 | -2/+14 |
| * | | | | | | Deprecate ActiveModel::Dirty#reset_changes in favor of #clear_changes_informa... | Rafael Mendonça França | 2014-07-15 | 1 | -2/+2 |
* | | | | | | | Keep quietly and capture undeprecated on your suite | Rafael Mendonça França | 2014-07-15 | 2 | -0/+29 |
* | | | | | | | Merge branch 'master' of git://github.com/rails/rails | Godfrey Chan | 2014-07-15 | 4 | -6/+24 |
|\| | | | | | | |||||
| * | | | | | | Merge branch 'jbrowning-fix_mariadb_rename_index' | Rafael Mendonça França | 2014-07-15 | 4 | -6/+24 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Predicate methods don't need to return `true` / `false` | Rafael Mendonça França | 2014-07-15 | 1 | -1/+1 |
| | * | | | | | | Fix version detection for RENAME INDEX support. Fixes #15931. | Jeff Browning | 2014-07-15 | 4 | -6/+24 |
* | | | | | | | | Document the change in `nil` handling for serialized attributes | Godfrey Chan | 2014-07-15 | 1 | -9/+12 |
* | | | | | | | | Fixed SQL syntax for postgresql | Godfrey Chan | 2014-07-15 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #16162 from chancancode/fix_json_coder | Godfrey Chan | 2014-07-15 | 2 | -1/+19 |
* | | | | | | | | Revert "Revert "Merge pull request #16059 from jenncoop/json-serialized-attr"" | Godfrey Chan | 2014-07-15 | 5 | -2/+76 |
|/ / / / / / / | |||||
* / / / / / / | Add CHANGELOG entry for #15266 | Godfrey Chan | 2014-07-15 | 1 | -0/+5 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #15266 from dv/use_counter_cache_for_empty_call | Godfrey Chan | 2014-07-15 | 2 | -0/+15 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | If a counter_cache exists, use it for #empty? | David Verhasselt | 2014-06-10 | 2 | -0/+15 |
* | | | | | | [CI SKIP] Doc fix. | Guo Xiang Tan | 2014-07-15 | 1 | -2/+2 |
* | | | | | | Merge pull request #16089 from eileencodes/refactor-reflections-from-sub-clas... | Aaron Patterson | 2014-07-14 | 3 | -101/+158 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Begin refactoring ThroughReflection | eileencodes | 2014-07-08 | 3 | -101/+158 |
* | | | | | | Address ORA-00972: identifier is too long when tested with Oracle | Yasuo Honda | 2014-07-14 | 3 | -4/+5 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #16127 from Envek/fix_16111 | Matthew Draper | 2014-07-14 | 3 | -1/+32 |
|\ \ \ \ \ | |||||
| * | | | | | Dump PostgreSQL primary key with custom function as a default. | Andrey Novikov | 2014-07-11 | 3 | -1/+32 |
* | | | | | | Fixing typo in comment | Gregory Igelmund | 2014-07-12 | 1 | -1/+1 |
* | | | | | | Merge pull request #16136 from sgrif/sg-pg-bit-string | Matthew Draper | 2014-07-12 | 2 | -13/+33 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Don't rely on the column SQL type for bit string quoting | Sean Griffin | 2014-07-11 | 2 | -13/+33 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #16055 from sgrif/sg-refactor-sqlite3-strings | Matthew Draper | 2014-07-12 | 2 | -14/+29 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Use a type object for type casting behavior on SQLite3 | Sean Griffin | 2014-07-11 | 2 | -14/+29 |
* | | | | | | Synced 4.2 release notes with the latest commits. | Godfrey Chan | 2014-07-11 | 1 | -1/+1 |
| |/ / / / |/| | | | | |||||
* | | | | | [ci skip] Add changelog for PR #14899 | eileencodes | 2014-07-08 | 1 | -0/+15 |
* | | | | | Include fixtures to prevent foreign key violation. | Zuhao Wan | 2014-07-09 | 1 | -0/+2 |
* | | | | | Merge pull request #16093 from zuhao/refactor_activerecord_nested_through_ass... | Rafael Mendonça França | 2014-07-08 | 1 | -0/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Warm up cache to prevent assertion failure. | Zuhao Wan | 2014-07-08 | 1 | -0/+1 |
* | | | | | Merge pull request #16071 from sgrif/sg-pg-type-cast | Rafael Mendonça França | 2014-07-08 | 1 | -15/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Remove PG's definition of `type_cast` | Sean Griffin | 2014-07-06 | 1 | -15/+0 |
| |/ / / / |