aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge branch 'rm-remove-mocha'Rafael Mendonça França2014-07-191-0/+2
|\ \ \
| * | | Stop requiring mocha automaticallyRafael Mendonça França2014-07-191-0/+2
* | | | Merge pull request #16227 from Aguynamedsteve/typo_correctionYves Senn2014-07-191-1/+1
|\ \ \ \
| * | | | Fixed typo in commentSteve2014-07-191-1/+1
* | | | | create_join_table uses same logic as HABTM reflectionsStefan Kanev2014-07-185-2/+44
* | | | | Merge pull request #15762 from arthurnn/better_error_on_bad_alias_methodMatthew Draper2014-07-183-10/+27
|\ \ \ \ \
| * | | | | Dont swallow errors when bad alias_methodArthur Neves2014-06-243-10/+27
* | | | | | Disable some tests on SQLiteRafael Mendonça França2014-07-171-77/+77
* | | | | | Prefer if/else for this caseRafael Mendonça França2014-07-171-3/+2
* | | | | | Merge pull request #16188 from marianovalles/fix_rational_to_decimal_type_castRafael Mendonça França2014-07-173-9/+38
|\ \ \ \ \ \
| * | | | | | Fix decimal_test module and add new test for object responding to to_dMariano Valles2014-07-162-7/+15
| * | | | | | Fix case statement to use ::Numeric and ::StringMariano Valles2014-07-163-18/+25
| * | | | | | Change class evaluation for Rationals in cast_valueMariano Valles2014-07-162-5/+7
| * | | | | | Fix rational to decimal on type_cast_from_userMariano Valles2014-07-162-1/+13
* | | | | | | Remove need for macro instance vareileencodes2014-07-171-11/+14
* | | | | | | 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