aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #13821 from vipulnsward/remove-assignment-in-testYves Senn2014-01-231-1/+0
|\ \ \ \
| * | | | Remove unused assignment to fix warnings in enum test.Vipul A M2014-01-241-1/+0
|/ / / /
* | | | Merge pull request #13819 from arthurnn/one_require_testGuillermo Iguaran2014-01-232-10/+8
|\ \ \ \
| * | | | unify param.require testsArthur Neves2014-01-232-10/+8
* | | | | Merge pull request #13818 from arthurnn/small_test_caseGuillermo Iguaran2014-01-231-0/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | test boolean and number json param parsingArthur Neves2014-01-231-0/+7
|/ / / /
* | | | Merge pull request #13795 from bobbus/errors-has-keyGodfrey Chan2014-01-232-2/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Update ActiveModel::Errors.has_key? testAdrien Coquio2014-01-221-1/+1
| * | | Fix ActiveModel::Errors#has_key? return valueAdrien Coquio2014-01-221-1/+1
| * | | Add failing test for ActiveModel::Errors#has_key? methodAdrien Coquio2014-01-221-0/+5
* | | | Merge pull request #13799 from kbrock/better_dirtyJeremy Kemper2014-01-227-18/+49
|\ \ \ \ | |_|/ / |/| | |
| * | | Move changed_attributes into dirty.rbKeenan Brock2014-01-226-16/+47
| * | | put core at the beginning so other classes can modify the behaviorKeenan Brock2014-01-222-2/+2
* | | | Merge pull request #13791 from kei-s/remove_duplicate_mergeCarlos Antonio da Silva2014-01-221-1/+0
|\ \ \ \
| * | | | Remove duplicate mergekei2014-01-221-1/+0
| | |/ / | |/| |
* | | | Improve the CHANGELOG entry [ci skip]Rafael Mendonça França2014-01-221-2/+14
* | | | Make CollectionProxy#reset return selfRafael Mendonça França2014-01-221-1/+2
* | | | Merge pull request #13790 from kschlarman/collection_association_reset_fixRafael Mendonça França2014-01-223-0/+36
|\ \ \ \ | |/ / / |/| | |
| * | | Calling reset on a collection association should unload the assocationKelsey Schlarman2014-01-213-0/+36
* | | | Merge pull request #13728 from semenyukdmitriy/masterYves Senn2014-01-222-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip] Added missing `file` delivery methodSemenyuk Dmitriy2014-01-222-2/+2
* | | | Merge pull request #13786 from terracatta/masterRafael Mendonça França2014-01-219-85/+168
|\ \ \ \
| * | | | Ensure AR #second, #third, etc. finders work through associationsJason Meller2014-01-219-85/+168
* | | | | Fix typoRafael Mendonça França2014-01-211-1/+1
|/ / / /
* | | | Merge pull request #13776 from rails/dirty-enumRafael Mendonça França2014-01-216-4/+128
|\ \ \ \ | |_|/ / |/| | |
| * | | Use string as keysRafael Mendonça França2014-01-211-2/+2
| * | | Store the enum values in the DEFINED_ENUM constantRafael Mendonça França2014-01-211-8/+8
| * | | Add more tests for the dirty feature for enumsRafael Mendonça França2014-01-215-8/+53
| * | | Make enum feature work with dirty methodsRafael Mendonça França2014-01-213-1/+76
| * | | Extract all attribute changed work to its own methodRafael Mendonça França2014-01-211-3/+7
* | | | Merge pull request #13784 from kuldeepaggarwal/fix-doc-collection-proxyRafael Mendonça França2014-01-211-1/+1
|\ \ \ \
| * | | | add missing information for `id` field when used with `select` [ci skip]Kuldeep Aggarwal2014-01-221-1/+1
|/ / / /
* | | | `has_one` and `belongs_to` accessors don't add ORDER BY to the queries anymore.Rafael Mendonça França2014-01-214-1/+26
* | | | prepend table name for `Relation#select` columns.Yves Senn2014-01-213-1/+20
* | | | Merge pull request #13696 from senny/engine_bin_rails_load_bundlerYves Senn2014-01-211-0/+4
|\ \ \ \
| * | | | setup Bundler in engines `bin/rails` stub.Yves Senn2014-01-131-0/+4
* | | | | Active Record changelog wording and formatting. [ci skip]Yves Senn2014-01-211-5/+6
* | | | | Merge pull request #9969 from divineforest/fix-find-in-batchesYves Senn2014-01-213-6/+13
|\ \ \ \ \
| * | | | | Fail early with "Primary key not included in the custom select clause" in fin...Alexander Balashov2014-01-213-6/+13
| | |/ / / | |/| | |
* / | | | Remove missed usage of @first variableCarlos Antonio da Silva2014-01-211-1/+1
|/ / / /
* | | | Forgot to push this change in the parent commitRafael Mendonça França2014-01-201-1/+1
* | | | When applying changes or reseting changes create the right classRafael Mendonça França2014-01-202-3/+11
* | | | Remove unneded argumentRafael Mendonça França2014-01-201-2/+2
* | | | Merge pull request #13757 from terracatta/masterRafael Mendonça França2014-01-2010-34/+245
|\ \ \ \
| * | | | Ensure #second acts like #first AR finderJason Meller2014-01-2010-34/+245
|/ / / /
* | | | Merge branch 'anilmaurya-master'Rafael Mendonça França2014-01-201-3/+1
|\ \ \ \
| * | | | moving controller_name assignment before model name conditionanilmaurya2014-01-201-3/+1
|/ / / /
* | | | Tidy up tests and CHANGELOG for #12598Andrew White2014-01-204-7/+37
* | | | Automatically convert dashes to underscores in shorthand routesMikko Johansson2014-01-202-0/+11
* | | | Automatically convert dashes to underscores for url helpersAmr Tamimi2014-01-204-2/+20