Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #20574 from repinel/fix-db-fixtures-load | Yves Senn | 2015-09-30 | 8 | -14/+130 |
|\ | |||||
| * | Allow fixtures YAML files to set the model class in the file itself | Roque Pinel | 2015-09-11 | 9 | -12/+130 |
* | | Merge pull request #21817 from jdantonio/clear-concurrent-ruby-warnings | Kasper Timm Hansen | 2015-09-30 | 3 | -6/+6 |
|\ \ | |||||
| * | | Fixed concurrent-ruby warnings. | Jerry D'Antonio | 2015-09-29 | 3 | -6/+6 |
|/ / | |||||
* | | Bump concurrent-ruby to shush circular require warning | Jeremy Daer | 2015-09-29 | 1 | -1/+1 |
* | | call `default_middleware_stack` before merging stacks | Aaron Patterson | 2015-09-29 | 1 | -1/+2 |
* | | Engines get different middleware than apps | Aaron Patterson | 2015-09-29 | 3 | -4/+29 |
* | | Merge pull request #21794 from jeremy/sprockets/move-asset-manifest-from-topl... | Jeremy Daer | 2015-09-29 | 11 | -191/+262 |
|\ \ | |||||
| * | | Eliminate overlapping `app/assets` load path | Jeremy Daer | 2015-09-29 | 11 | -191/+262 |
* | | | Make app building threadsafe | eileencodes | 2015-09-29 | 1 | -4/+8 |
* | | | Stop modifying global variables | eileencodes | 2015-09-29 | 3 | -8/+4 |
* | | | Merge pull request #21813 from prakashlaxkar/doc_changes | Rafael Mendonça França | 2015-09-29 | 6 | -6/+6 |
|\ \ \ | |||||
| * | | | Improve readability of docs by using code tag [ci skip] | Prakash Laxkar | 2015-09-29 | 6 | -6/+6 |
* | | | | Merge pull request #21816 from nburkley/has-many-documentation | Arthur Nogueira Neves | 2015-09-29 | 1 | -1/+4 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix documentation for has_many dependant options. | Niall Burkley | 2015-09-29 | 1 | -1/+4 |
|/ / / | |||||
* | | | Merge pull request #21430 from kaspth/test-runner-fail-fast | Kasper Timm Hansen | 2015-09-29 | 5 | -6/+197 |
|\ \ \ | |||||
| * | | | Add fail fast to test runner. | Kasper Timm Hansen | 2015-09-29 | 5 | -0/+84 |
| * | | | Add inline failure reporting to test runner. | Kasper Timm Hansen | 2015-09-28 | 5 | -6/+113 |
* | | | | Merge pull request #21661 from akshay-vishnoi/submit_tag_tests | Rafael Mendonça França | 2015-09-29 | 2 | -1/+9 |
|\ \ \ \ | |||||
| * | | | | Fix - Prevent adding of `data-disable-with` option twice in html. | Akshay Vishnoi | 2015-09-18 | 2 | -1/+9 |
* | | | | | Merge pull request #21811 from akihiro17/remove-unused-test-code | Rafael Mendonça França | 2015-09-29 | 1 | -11/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Remove TestRouter#add_routes | akihiro17 | 2015-09-29 | 1 | -11/+0 |
|/ / / / / | |||||
* | | | | | Merge pull request #21810 from akshay-vishnoi/form-tag-tests | Rafael Mendonça França | 2015-09-29 | 1 | -3/+3 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Fix names of test cases | Akshay Vishnoi | 2015-09-29 | 1 | -3/+3 |
|/ / / / | |||||
* | | | | Merge pull request #21807 from ronakjangir47/fix_formatted_offset_docs | Rafael Mendonça França | 2015-09-29 | 3 | -3/+10 |
|\ \ \ \ | |||||
| * | | | | Update docs for `formatted_offset` | Ronak Jangir | 2015-09-29 | 3 | -3/+10 |
* | | | | | remove useless method | Aaron Patterson | 2015-09-28 | 1 | -4/+0 |
* | | | | | Separate `dup` from `deep_dup` in the attributes hash | Sean Griffin | 2015-09-28 | 5 | -6/+36 |
* | | | | | Inline `Attribute#original_value` | Sean Griffin | 2015-09-28 | 1 | -5/+1 |
* | | | | | Merge pull request #21800 from Gaurav2728/no_more_class_methods_for_JoinDepen... | Rafael Mendonça França | 2015-09-28 | 1 | -2/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | no more class methods for JoinDependency [ci skip] | Gaurav Sharma | 2015-09-29 | 1 | -2/+1 |
* | | | | | Merge pull request #21782 from ronakjangir47/transform_values_docs | Rafael Mendonça França | 2015-09-28 | 2 | -8/+17 |
|\ \ \ \ \ | |||||
| * | | | | | Updated docs for transform_values [ci skip] | Ronak Jangir | 2015-09-28 | 1 | -3/+8 |
| * | | | | | Updated docs for transform_keys [ci skip] | Ronak Jangir | 2015-09-28 | 1 | -5/+9 |
* | | | | | | Speed up `Hash#transform_values` when empty | Sean Griffin | 2015-09-28 | 1 | -0/+1 |
* | | | | | | Merge pull request #21797 from dv/docs-rewording-in-database-configure-guide | Kasper Timm Hansen | 2015-09-28 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Make fuzzy sentence more clear | David Verhasselt | 2015-09-28 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #21789 from y-yagi/fix_warning_in_minitest_plugin | Kasper Timm Hansen | 2015-09-28 | 1 | -1/+2 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | check if @rake_patterns is defined | yuuji.yaginuma | 2015-09-28 | 1 | -1/+2 |
* | | | | | | Merge pull request #21793 from amitsuroliya/minor_doc_changes | Arthur Nogueira Neves | 2015-09-27 | 2 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix minor docs [ci skip] | amitkumarsuroliya | 2015-09-28 | 2 | -2/+2 |
* | | | | | | | Merge pull request #21783 from amitsuroliya/record_not_found | Rafael Mendonça França | 2015-09-28 | 1 | -7/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix `ActiveRecord::RecordNotFound` error message with custom primary key [ci ... | amitkumarsuroliya | 2015-09-26 | 1 | -7/+7 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #21780 from yui-knk/fix_ar_sanitize_doc | Rafael Mendonça França | 2015-09-28 | 1 | -19/+56 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | [ci skip] Update docs of `AR::Sanitization` | yui-knk | 2015-09-26 | 1 | -19/+56 |
* | | | | | | | Merge pull request #21790 from yui-knk/fix_doc_date_field | Rafael Mendonça França | 2015-09-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | [ci skip] Fix which method `FormHelper#date_field` try to call | yui-knk | 2015-09-27 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #21785 from vngrs/minor_doc_fix | Sean Griffin | 2015-09-27 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | minor doc fix [ci skip] | Mehmet Emin İNAÇ | 2015-09-27 | 1 | -3/+3 |
* | | | | | | | | | Fix test that was failing because of typo | eileencodes | 2015-09-27 | 1 | -1/+1 |