aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge pull request #15852 from SyntaxBlitz/masterRafael Mendonça França2014-06-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Change double quotes to single quotes in guideTimothy Aveni2014-06-211-1/+1
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #15867 from sgrif/sg-rm-column-typesYves Senn2014-06-233-5/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Remove unneeded `@column_types` instance variableSean Griffin2014-06-223-5/+1
* | | | | | | | | | changelog entries for #15866 and #15848Yves Senn2014-06-221-0/+11
* | | | | | | | | | Merge pull request #15848 from sgrif/sg-remove-deprecationYves Senn2014-06-221-8/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove old deprecation warningSean Griffin2014-06-221-8/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #15865 from sgrif/sg-missing-testYves Senn2014-06-221-0/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add missing test cases for `attribute_names` instance methodSean Griffin2014-06-221-0/+20
* | | | | | | | | | Merge pull request #15866 from sgrif/sg-reload-attributesYves Senn2014-06-223-5/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | `reload` should fully reload attributesSean Griffin2014-06-223-5/+8
|/ / / / / / / / /
* | | | | | | | | Merge pull request #15860 from aidanharan/docrails-assets-manifest-typoYves Senn2014-06-221-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Added missing colon in asset manifest JSON.Aidan Haran2014-06-181-1/+1
* | | | | | | | | Merge pull request #15859 from zuhao/refactor_activesupport_caching_testYves Senn2014-06-221-14/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Create with_env helper for tests.Zuhao Wan2014-06-221-14/+13
|/ / / / / / / / /
* | | | | | | | | Merge pull request #15839 from sgrif/sg-attr-set-nullYves Senn2014-06-226-12/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Return a null object from `AttributeSet#[]`Sean Griffin2014-06-206-12/+17
* | | | | | | | | | Merge pull request #15849 from sgrif/sg-move-attributesYves Senn2014-06-223-3/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move `attributes` to the `AttributeSet` object.Sean Griffin2014-06-213-3/+14
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #15850 from sgrif/sg-missing-testsYves Senn2014-06-221-0/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add missing test cases for `attribute_method?`Sean Griffin2014-06-211-0/+11
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #15856 from zuhao/refactor_activesupport_decoding_testYves Senn2014-06-221-11/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use with_parse_json_times helper in tests.Zuhao Wan2014-06-221-11/+19
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #15857 from zuhao/refactor_activesupport_encoding_testYves Senn2014-06-221-14/+19
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Avoid hardcoded magic number in test teardown.Zuhao Wan2014-06-221-14/+19
|/ / / / / / / / /
* | | | | | | | | :nail_care: wrap the tip from #15624 at 80 chars [ci skip]Zachary Scott2014-06-201-1/+2
* | | | | | | | | Merge pull request #15624 from aditya-kapoor/add-warnings-on-guidesZachary Scott2014-06-201-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | [ci skip] Add Tip for change_column_null and change_column_default in guidesAditya Kapoor2014-06-211-0/+2
* | | | | | | | | Merge pull request #15764 from arthurnn/dependencies_name_errorMatthew Draper2014-06-213-5/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add regression test for NameError#nameArthur Neves2014-06-202-2/+5
| * | | | | | | | | Make dependencies.rb add a name to NameErrorArthur Neves2014-06-202-4/+7
|/ / / / / / / / /
* | | | | | | | | docs, configurations method is listed in the docs. [ci skip]Yves Senn2014-06-201-1/+0
* | | | | | | | | Merge pull request #15809 from maurogeorge/guides-console-appYves Senn2014-06-201-0/+25
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Add to guides app and helper objects on command lineMauro George2014-06-191-0/+25
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #15537 from tgxworld/fix_state_leakMatthew Draper2014-06-204-5/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Remove redundant code.Guo Xiang Tan2014-06-051-4/+0
| * | | | | | | Prevent state leak.Guo Xiang Tan2014-06-054-1/+5
* | | | | | | | Merge pull request #15824 from bhicks/remove-extra-list-item-elementSean Griffin2014-06-191-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Remove extra list item elementBen Hicks2014-06-191-1/+1
|/ / / / / / /
* | | | | | | add both branches to the only_path conditionalAaron Patterson2014-06-191-6/+6
* | | | | | | Merge pull request #15728 from sgrif/sg-double-save-hm-tRafael Mendonça França2014-06-193-4/+30
|\ \ \ \ \ \ \
| * | | | | | | Don't save through records twiceSean Griffin2014-06-173-3/+29
* | | | | | | | Merge pull request #15823 from yuki24/better-docmentation-for-dynamic-error-p...Rafael Mendonça França2014-06-191-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | ErrorsController shouldn't inherit ApplicationController, but ActionControlle...Yuki Nishijima2014-06-191-1/+1
* | | | | | | | | Merge pull request #15747 from sgrif/sg-trolololol-this-is-so-brokenRafael Mendonça França2014-06-193-1/+56
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Always update counter caches in memory when adding recordsSean Griffin2014-06-163-1/+56
* | | | | | | | | | Merge pull request #15800 from sgrif/sg-column-in-calculationRafael Mendonça França2014-06-192-17/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't use `Column` for type casting in Relation calculationsSean Griffin2014-06-182-17/+8
* | | | | | | | | | | Merge pull request #15801 from sgrif/sg-column-defaultsRafael Mendonça França2014-06-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Don't use column object when calculating type cast defaultsSean Griffin2014-06-181-2/+2
| |/ / / / / / / / / /