aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix documentation from #15669 [ci skip]Zachary Scott2014-06-171-3/+5
* [ci skip] fix doc for the Hash#assert_valid_keysAditya Kapoor2014-06-171-3/+3
* Merge pull request #15780 from sgrif/sg-dont-always-save-mutable-typesRafael Mendonça França2014-06-173-2/+4
|\
| * Don't assume that Hstore columns have always changedSean Griffin2014-06-173-2/+4
* | Merge pull request #15775 from sgrif/sg-use-column-defaults-in-dirtyRafael Mendonça França2014-06-171-11/+3
|\ \ | |/ |/|
| * Use `column_defaults` in dirty for checking changed defaultsSean Griffin2014-06-171-11/+3
|/
* Merge pull request #15771 from sgrif/sg-stop-messing-with-column-defaultsRafael Mendonça França2014-06-173-12/+32
|\
| * Don't mess with `column_defaults` when optimistic locking is enabledSean Griffin2014-06-173-12/+32
|/
* Merge pull request #15768 from zuhao/refactor_activesupport_concern_testYves Senn2014-06-171-1/+2
|\
| * Move test teardown into `ensure` block.Zuhao Wan2014-06-171-1/+2
|/
* add `bin/rake db:purge` task to empty the current database.Yves Senn2014-06-174-0/+55
* fix typo in test method names. [ci skip]Yves Senn2014-06-171-4/+4
* Merge pull request #15765 from rahul100885/masterYves Senn2014-06-171-3/+3
|\
| * [ci skip] doc corrected : ActiveRecord::Base.connections to ActiveRecord::Bas...Rahul P. Chaudhari2014-06-171-3/+3
|/
* Formatting fix in AS changelog [ci skip]Juanjo Bazán2014-06-161-2/+5
* Merge pull request #15760 from sgrif/sg-decorate-matchingRafael Mendonça França2014-06-166-32/+57
|\
| * Promote time zone aware attributes to a first class type decoratorSean Griffin2014-06-166-32/+57
|/
* Merge pull request #15759 from sgrif/sg-extract-type-decoratorRafael Mendonça França2014-06-161-8/+24
|\
| * Refactor application of type decorators into an objectSean Griffin2014-06-161-8/+24
* | Merge pull request #15758 from aditya-kapoor/replace-keywordRafael Mendonça França2014-06-162-4/+4
|\ \
| * | [ci skip] /javascript/ ~> JavaScriptAditya Kapoor2014-06-172-4/+4
|/ /
* | Merge pull request #15756 from aditya-kapoor/add-api-doc-for-queryingZachary Scott2014-06-161-1/+9
|\ \ | |/ |/|
| * [ci skip] add API doc for AR Group.Aditya Kapoor2014-06-171-1/+9
|/
* :scissors: and :nail_care: from d60c405 [ci skip]Zachary Scott2014-06-161-3/+3
* Merge pull request #15751 from aditya-kapoor/correct-serialization-docZachary Scott2014-06-161-11/+11
|\
| * [ci skip] correct doc for serialization in accordance with API Doc GuideAditya Kapoor2014-06-161-11/+11
* | Merge pull request #15755 from sgrif/sg-dirty-refactorRafael Mendonça França2014-06-163-9/+26
|\ \
| * | Refactor in-place dirty checking to use the attribute objectSean Griffin2014-06-163-9/+26
* | | Add important plugins as one of the tasks of the releaseRafael Mendonça França2014-06-161-0/+12
|/ /
* | Merge pull request #15684 from aditya-kapoor/add-tests-for-assert-valid-keysRafael Mendonça França2014-06-161-0/+15
|\ \
| * | Add test cases for Hash#asset_valid_keysAditya Kapoor2014-06-141-0/+15
* | | Merge pull request #13963 from lucas-clemente/pending_migrationsRafael Mendonça França2014-06-162-5/+58
|\ \ \ | |_|/ |/| |
| * | skip migration check if adapter doesn't support itLucas Clemente2014-04-192-5/+58
* | | Merge pull request #15744 from mmozuras/special_keys_setYves Senn2014-06-161-1/+1
|\ \ \
| * | | Change Http::Cache::SPECIAL_KEYS from Array to SetMindaugas Mozūras2014-06-151-1/+1
* | | | Merge pull request #15743 from tgxworld/remove_unused_parametersYves Senn2014-06-161-1/+1
|\ \ \ \
| * | | | Remove unused parameter.Guo Xiang Tan2014-06-151-1/+1
| |/ / /
* | | | Merge pull request #15722 from akshay-vishnoi/spell-correctZachary Scott2014-06-158-11/+11
|\ \ \ \
| * | | | /mysql/i -> MySQL, Spell correct in continuation to #15555Akshay Vishnoi2014-06-148-11/+11
* | | | | Merge pull request #15723 from akshay-vishnoi/sql-correctionZachary Scott2014-06-152-3/+3
|\ \ \ \ \
| * | | | | [ci skip] Use `an` for SQLAkshay Vishnoi2014-06-142-3/+3
| |/ / / /
* | | | | Merge pull request #15748 from akshay-vishnoi/activemodelRafael Mendonça França2014-06-151-3/+4
|\ \ \ \ \
| * | | | | Correct typo, add test for validates_absence_of, correct method namesAkshay Vishnoi2014-06-161-3/+4
|/ / / / /
* | | | | Merge pull request #15745 from mmozuras/remove_unused_separators_paramRafael Mendonça França2014-06-151-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove unused param 'separators' from RouteSet#build_pathMindaugas Mozūras2014-06-151-2/+2
|/ / / /
* | | | Merge pull request #15741 from sgrif/sg-update-deprecation-messageYves Senn2014-06-151-8/+2
|\ \ \ \
| * | | | Change the deprecation warning on `serialized_attributes`Sean Griffin2014-06-151-8/+2
|/ / / /
* | | | allow preview interceptors to be registered through `config.action_mailer`.Yves Senn2014-06-154-1/+41
* | | | Merge pull request #15739 from y-yagi/correct_doc_for_action_mailer_baseYves Senn2014-06-151-1/+1
|\ \ \ \
| * | | | [ci skip] correct doc for `register_preview_interceptor`yuuji.yaginuma2014-06-151-1/+1