aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | 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
|\ \ \