aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | 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
* | | | | Merge pull request #15738 from kuldeepaggarwal/remove-unwanted-codeYves Senn2014-06-152-13/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remove unnecessary calling of `I18n.backend.store_translations(empty, {})`Kuldeep Aggarwal2014-06-152-13/+4
|/ / / /
* | | | Merge pull request #15737 from kuldeepaggarwal/fix-buildYves Senn2014-06-141-0/+2
|\ \ \ \
| * | | | reload I18n as we are defining `:ts` localeKuldeep Aggarwal2014-06-151-0/+2
* | | | | Merge pull request #15735 from aditya-kapoor/update-wiki-mdZachary Scott2014-06-141-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ci skip] update wiki link for MVCAditya Kapoor2014-06-151-1/+1
|/ / / /
* | | | Merge pull request #15734 from aditya-kapoor/correct-linkZachary Scott2014-06-141-1/+1
|\ \ \ \
| * | | | [ci-skip] correct wikipedia MVC linkAditya Kapoor2014-06-141-1/+1
* | | | | Edit pass on `has_secure_password` documentation [ci skip]Godfrey Chan2014-06-141-5/+6
|/ / / /
* | | | Merge pull request #15704 from sgrif/sg-deprecate-serializedYves Senn2014-06-143-18/+26
|\ \ \ \
| * | | | Deprecate `serialized_attributes` without replacementSean Griffin2014-06-143-18/+26
| |/ / /
* | | | Merge pull request #15715 from zuhao/refactor_actionview_cleanup_I18n_transla...Yves Senn2014-06-143-4/+11
|\ \ \ \
| * | | | Clean up I18n stored translations after test.Zuhao Wan2014-06-143-4/+12
* | | | | docs, remove getting started guide sample application. [ci skip]Yves Senn2014-06-1489-1137/+2
* | | | | Merge pull request #15724 from akshay-vishnoi/secure_password_docsEileen M. Uchitelle2014-06-141-6/+9
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [ci skip] Update #has_secure_password docsAkshay Vishnoi2014-06-141-6/+9
|/ / / /
* | | | Merge pull request #15717 from akshay-vishnoi/test-casesGodfrey Chan2014-06-141-6/+6
|\ \ \ \
| * | | | Use `@existing_user` while updating existing user, fixing - #ee4e86Akshay Vishnoi2014-06-141-6/+6
* | | | | pg guide, use the term `database views` to be specific. [ci skip]Yves Senn2014-06-141-3/+3
* | | | | Merge pull request #15712 from zuhao/refactor_actionview_javascript_helper_testYves Senn2014-06-141-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Avoid hard-coded value in test setup and teardown.Zuhao Wan2014-06-141-3/+3
* | | | | Merge pull request #15710 from zuhao/refactor_actionview_digestor_testMatthew Draper2014-06-141-0/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * / / Make sure restoration always happen.Zuhao Wan2014-06-141-0/+1
|/ / /
* | | Cleaned up the `has_secure_password` test casesGodfrey Chan2014-06-141-33/+29
* | | Added changelog for #15708 [ci skip]Godfrey Chan2014-06-141-0/+7
* | | Merge pull request #15708 from akshay-vishnoi/secure_passwordGodfrey Chan2014-06-142-0/+34
|\ \ \
| * | | SecurePassword - Validate password must be less than or equal to 72Akshay Vishnoi2014-06-142-0/+34
|/ / /
* | | Parsing DATABASE_URI, use URI#hostname: it's smarter about IPv6Matthew Draper2014-06-143-1/+20
* | | Merge pull request #15702 from sgrif/sg-rm-serializedRafael Mendonça França2014-06-134-14/+2
|\ \ \
| * | | Remove `serialized?` from the type interfaceSean Griffin2014-06-134-14/+2
* | | | Merge pull request #15660 from larrylv/fix-mount-at-root-pathRafael Mendonça França2014-06-133-0/+14
|\ \ \ \
| * | | | Fix request's path_info when a rack app mounted at '/'.Larry Lv2014-06-143-0/+14
| |/ / /
* | | | Merge pull request #15701 from zzak/issue_15496Rafael Mendonça França2014-06-131-1/+5
|\ \ \ \
| * | | | Open extension point for defining options in build_through_recordZachary Scott2014-06-131-1/+5
* | | | | Merge pull request #15694 from sgrif/sg-method-missingRafael Mendonça França2014-06-131-34/+1
|\ \ \ \ \
| * | | | | Remove unused `method_missing` definitionSean Griffin2014-06-131-34/+1
* | | | | | Merge pull request #15679 from akshay-vishnoi/test-casesRafael Mendonça França2014-06-131-1/+19
|\ \ \ \ \ \
| * | | | | | Add missing test cases for #assert_no_differenceAkshay Vishnoi2014-06-131-1/+19
* | | | | | | Merge pull request #15343 from dontfidget/fix_polymorphic_automatic_inverse_ofRafael Mendonça França2014-06-135-1/+16
|\ \ \ \ \ \ \
| * | | | | | | use name specified by 'as' for automatic inverse association to avoid reflect...Andrew S. Brown2014-06-105-1/+16
* | | | | | | | Merge pull request #15693 from pdg137/enforce_utf8Matthew Draper2014-06-143-7/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | In actionview, eliminate calls to tag that use html_safe parameter values. Th...Paul Grayson2014-06-133-8/+7
* | | | | | | | Merge pull request #15579 from sgrif/sg-through-associationsRafael Mendonça França2014-06-135-7/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | Through associations should set both parent ids on join modelsSean Griffin2014-06-135-7/+47
* | | | | | | | | Merge pull request #15692 from sromano/falseClassMatthew Draper2014-06-143-2/+29
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | ActionController::Parameters#require now accepts FalseClass valuesSergio Romano2014-06-133-1/+24
* | | | | | | | | Merge pull request #15674 from sgrif/sg-mutable-attributesMatthew Draper2014-06-1412-36/+149
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Detect in-place changes on mutable AR attributesSean Griffin2014-06-1312-36/+149