| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | Merge pull request #15723 from akshay-vishnoi/sql-correction | Zachary Scott | 2014-06-15 | 2 | -3/+3 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [ci skip] Use `an` for SQL | |||||
| | * | | | | | | | [ci skip] Use `an` for SQL | Akshay Vishnoi | 2014-06-14 | 2 | -3/+3 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge pull request #15748 from akshay-vishnoi/activemodel | Rafael Mendonça França | 2014-06-15 | 1 | -3/+4 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Correct typo, add test for validates_absence_of | |||||
| | * | | | | | | | Correct typo, add test for validates_absence_of, correct method names | Akshay Vishnoi | 2014-06-16 | 1 | -3/+4 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge pull request #15745 from mmozuras/remove_unused_separators_param | Rafael Mendonça França | 2014-06-15 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Remove unused param 'separators' from RouteSet#build_path | |||||
| | * | | | | | | Remove unused param 'separators' from RouteSet#build_path | Mindaugas Mozūras | 2014-06-15 | 1 | -2/+2 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #15741 from sgrif/sg-update-deprecation-message | Yves Senn | 2014-06-15 | 1 | -8/+2 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Change the deprecation warning on `serialized_attributes` | |||||
| | * | | | | | | Change the deprecation warning on `serialized_attributes` | Sean Griffin | 2014-06-15 | 1 | -8/+2 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | to "without replacement" | |||||
| * | | | / / | allow preview interceptors to be registered through `config.action_mailer`. | Yves Senn | 2014-06-15 | 4 | -1/+41 | |
| | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was partially broken because `preview_interceptors=` just assigned the raw values, whithout going through `register_preview_interceptor`. Now the Action Mailer railtie takes care of the `preview_interceptors` option. This commit is a partial revert of: Revert "Merge pull request #15739 from y-yagi/correct_doc_for_action_mailer_base" This reverts commit a15704d7f35f17d34d0118546799141d6f853656, reversing changes made to 1bd12a8609d275ad75fcc4b622ca4f5b32dc76be. /cc @kuldeepaggarwal @y-yagi | |||||
| * | | | | | Merge pull request #15739 from y-yagi/correct_doc_for_action_mailer_base | Yves Senn | 2014-06-15 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | [ci skip] correct doc for `register_preview_interceptor` | |||||
| | * | | | | | [ci skip] correct doc for `register_preview_interceptor` | yuuji.yaginuma | 2014-06-15 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #15738 from kuldeepaggarwal/remove-unwanted-code | Yves Senn | 2014-06-15 | 2 | -13/+4 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | remove unnecessary calling of `I18n.backend.store_translations('empty', {})` | |||||
| | * | | | | | remove unnecessary calling of `I18n.backend.store_translations(empty, {})` | Kuldeep Aggarwal | 2014-06-15 | 2 | -13/+4 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | Clean up I18n stored translations after test continuation with #15714 | |||||
| * | | | | | Merge pull request #15737 from kuldeepaggarwal/fix-build | Yves Senn | 2014-06-14 | 1 | -0/+2 | |
| |\ \ \ \ \ | | | | | | | | | | | | | reload I18n as we are defining `:ts` locale in `test_number_to_human_with_custom_translation_scope` | |||||
| | * | | | | | reload I18n as we are defining `:ts` locale | Kuldeep Aggarwal | 2014-06-15 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | fix build- see https://travis-ci.org/rails/rails/jobs/27578159#L2913. | |||||
| * | | | | | | Merge pull request #15735 from aditya-kapoor/update-wiki-md | Zachary Scott | 2014-06-14 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | [ci skip] update wiki link for MVC in README | |||||
| | * | | | | | [ci skip] update wiki link for MVC | Aditya Kapoor | 2014-06-15 | 1 | -1/+1 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #15734 from aditya-kapoor/correct-link | Zachary Scott | 2014-06-14 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | [ci-skip] correct wikipedia MVC link | |||||
| | * | | | | | [ci-skip] correct wikipedia MVC link | Aditya Kapoor | 2014-06-14 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Edit pass on `has_secure_password` documentation [ci skip] | Godfrey Chan | 2014-06-14 | 1 | -5/+6 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #15704 from sgrif/sg-deprecate-serialized | Yves Senn | 2014-06-14 | 3 | -18/+26 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Deprecate `serialized_attributes` without replacement | |||||
| | * | | | | | Deprecate `serialized_attributes` without replacement | Sean Griffin | 2014-06-14 | 3 | -18/+26 | |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | We've stopped using it internally, in favor of polymorphism. So should you! | |||||
| * | | | | | Merge pull request #15715 from ↵ | Yves Senn | 2014-06-14 | 3 | -4/+11 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zuhao/refactor_actionview_cleanup_I18n_translations Clean up I18n stored translations after test. | |||||
| | * | | | | | Clean up I18n stored translations after test. | Zuhao Wan | 2014-06-14 | 3 | -4/+12 | |
| | | | | | | | ||||||
| * | | | | | | docs, remove getting started guide sample application. [ci skip] | Yves Senn | 2014-06-14 | 89 | -1137/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This application always gets out of sync and doesn't add much value. Closes #15721 /cc @rafaelfranca | |||||
| * | | | | | | Merge pull request #15724 from akshay-vishnoi/secure_password_docs | Eileen M. Uchitelle | 2014-06-14 | 1 | -6/+9 | |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | [ci skip] Update #has_secure_password docs | |||||
| | * | | | | | [ci skip] Update #has_secure_password docs | Akshay Vishnoi | 2014-06-14 | 1 | -6/+9 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #15717 from akshay-vishnoi/test-cases | Godfrey Chan | 2014-06-14 | 1 | -6/+6 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Use `@existing_user` while updating existing user, fixing - ee4e86 | |||||
| | * | | | | | Use `@existing_user` while updating existing user, fixing - #ee4e86 | Akshay Vishnoi | 2014-06-14 | 1 | -6/+6 | |
| | | |_|_|/ | |/| | | | ||||||
| * | | | | | pg guide, use the term `database views` to be specific. [ci skip] | Yves Senn | 2014-06-14 | 1 | -3/+3 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #15712 from zuhao/refactor_actionview_javascript_helper_test | Yves Senn | 2014-06-14 | 1 | -3/+3 | |
| |\ \ \ \ \ | |/ / / / |/| | | | | Avoid hard-coded value in test setup and teardown. | |||||
| | * | | | | Avoid hard-coded value in test setup and teardown. | Zuhao Wan | 2014-06-14 | 1 | -3/+3 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #15710 from zuhao/refactor_actionview_digestor_test | Matthew Draper | 2014-06-14 | 1 | -0/+1 | |
| |\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | Make sure restoration always happen. | |||||
| | * / / | Make sure restoration always happen. | Zuhao Wan | 2014-06-14 | 1 | -0/+1 | |
| |/ / / | ||||||
| * | | | Cleaned up the `has_secure_password` test cases | Godfrey Chan | 2014-06-14 | 1 | -33/+29 | |
| | | | | | | | | | | | | | | | | | | | * Grouped the valid test cases in one place * Make the length of the generated password obvious * Removed two wrong (copy-and-pasted) test cases | |||||
| * | | | Added changelog for #15708 [ci skip] | Godfrey Chan | 2014-06-14 | 1 | -0/+7 | |
| | | | | ||||||
| * | | | Merge pull request #15708 from akshay-vishnoi/secure_password | Godfrey Chan | 2014-06-14 | 2 | -0/+34 | |
| |\ \ \ | | | | | | | | | SecurePassword - Validate password must be less than or equal to 72 | |||||
| | * | | | SecurePassword - Validate password must be less than or equal to 72 | Akshay Vishnoi | 2014-06-14 | 2 | -0/+34 | |
| |/ / / | | | | | | | | | | See #14591, Reason - BCrypt hash function can handle maximum 72 characters. | |||||
| * | | | Parsing DATABASE_URI, use URI#hostname: it's smarter about IPv6 | Matthew Draper | 2014-06-14 | 3 | -1/+20 | |
| | | | | | | | | | | | | | Fixes #15705. | |||||
| * | | | Merge pull request #15702 from sgrif/sg-rm-serialized | Rafael Mendonça França | 2014-06-13 | 4 | -14/+2 | |
| |\ \ \ | | | | | | | | | Remove `serialized?` from the type interface | |||||
| | * | | | Remove `serialized?` from the type interface | Sean Griffin | 2014-06-13 | 4 | -14/+2 | |
| | | | | | ||||||
| * | | | | Merge pull request #15660 from larrylv/fix-mount-at-root-path | Rafael Mendonça França | 2014-06-13 | 3 | -0/+14 | |
| |\ \ \ \ | | | | | | | | | | | Fix request's path_info when a rack app mounted at '/'. | |||||
| | * | | | | Fix request's path_info when a rack app mounted at '/'. | Larry Lv | 2014-06-14 | 3 | -0/+14 | |
| | |/ / / | | | | | | | | | | | | | Fixes issue #15511. | |||||
| * | | | | Merge pull request #15701 from zzak/issue_15496 | Rafael Mendonça França | 2014-06-13 | 1 | -1/+5 | |
| |\ \ \ \ | | | | | | | | | | | Open extension point for defining options in build_through_record | |||||
| | * | | | | Open extension point for defining options in build_through_record | Zachary Scott | 2014-06-13 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | | | | | | This fixes #15496 | |||||
| * | | | | | Merge pull request #15694 from sgrif/sg-method-missing | Rafael Mendonça França | 2014-06-13 | 1 | -34/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Remove unused `method_missing` definition | |||||
| | * | | | | | Remove unused `method_missing` definition | Sean Griffin | 2014-06-13 | 1 | -34/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | We always define attribute methods in the constructor or in `init_with`. | |||||
| * | | | | | | Merge pull request #15679 from akshay-vishnoi/test-cases | Rafael Mendonça França | 2014-06-13 | 1 | -1/+19 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Add missing test cases for #assert_no_difference | |||||
| | * | | | | | | Add missing test cases for #assert_no_difference | Akshay Vishnoi | 2014-06-13 | 1 | -1/+19 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #15343 from dontfidget/fix_polymorphic_automatic_inverse_of | Rafael Mendonça França | 2014-06-13 | 5 | -1/+16 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | prevent bad automatic inverse_of association | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |