Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #23747 from kamipo/add_accidentally_removed_sharp | Sean Griffin | 2016-02-17 | 1 | -6/+6 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add accidentally removed `#` [ci skip] | Ryuta Kamizono | 2016-02-18 | 1 | -6/+6 | |
* | | | | | | | Merge pull request #23736 from kamipo/remove_needless_case_insensitive_compar... | Sean Griffin | 2016-02-17 | 2 | -7/+4 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Remove needless `case_insensitive_comparison` in mysql2 adapter | Ryuta Kamizono | 2016-02-17 | 2 | -7/+4 | |
* | | | | | | | fields_for_style needs to test for AC::Parameters | Aaron Patterson | 2016-02-17 | 2 | -1/+22 | |
* | | | | | | | Fix indentation for code block in changelog | Eileen M. Uchitelle | 2016-02-17 | 1 | -4/+4 | |
* | | | | | | | Merge pull request #23746 from meinac/fix_ar_change_log | Eileen M. Uchitelle | 2016-02-17 | 1 | -3/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove accidentally duplicated change log title [ci skip] | Mehmet Emin İNAÇ | 2016-02-18 | 1 | -3/+0 | |
|/ / / / / / / | ||||||
* | | | | | | | partially revert 69009f4473637a44ade26d954ef5ddea6ff903f2 | Aaron Patterson | 2016-02-17 | 1 | -4/+1 | |
* | | | | | | | Merge pull request #22365 from phuibonhoa/phuibonhoa/polymorphic_where_multip... | Sean Griffin | 2016-02-17 | 7 | -6/+111 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Fixed `where` for polymorphic associations when passed an array containing di... | Philippe Huibonhoa | 2016-02-16 | 7 | -6/+111 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | Merge pull request #23570 from rthbound/addresses-23568 | Matthew Draper | 2016-02-18 | 2 | -8/+14 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Addresses #23568 | Ryan T. Hosford | 2016-02-09 | 2 | -8/+14 | |
* | | | | | | Merge pull request #23730 from y-yagi/fail_fast_when_test_error | Andrew White | 2016-02-17 | 4 | -5/+20 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | modify to `error` also abort when specify fail fast option | yuuji.yaginuma | 2016-02-17 | 4 | -5/+20 | |
* | | | | | | | Merge pull request #23732 from bquorning/actioncontroller-parameters-inspect | Yves Senn | 2016-02-17 | 3 | -2/+15 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Implement ActionController::Parameters#inspect | Benjamin Quorning | 2016-02-17 | 3 | -2/+15 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #23662 from rthbound/adds-missing-digestor-nested-deps-tests | Yves Senn | 2016-02-17 | 2 | -0/+12 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | adds tests for Digestor#nested_dependencies | Ryan T. Hosford | 2016-02-13 | 2 | -0/+12 | |
* | | | | | | | Merge pull request #23731 from y-yagi/remove_unused_method | Kasper Timm Hansen | 2016-02-17 | 1 | -4/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | remove unused method | yuuji.yaginuma | 2016-02-17 | 1 | -4/+0 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #23729 from maclover7/rm-unused-journey | Rafael França | 2016-02-17 | 2 | -8/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove unused Journey code | Jon Moss | 2016-02-17 | 2 | -8/+0 | |
* | | | | | | | | Merge pull request #23727 from prathamesh-sonpatki/fix-error-message-for-or | Rafael França | 2016-02-17 | 2 | -0/+10 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Show proper error message when a non-relation object is passed to AR::Relatio... | Prathamesh Sonpatki | 2016-02-17 | 2 | -0/+10 | |
* | | | | | | | | | Merge pull request #23728 from prathamesh-sonpatki/add-ac-changelong-in-relas... | Rafael França | 2016-02-17 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Add Action Cable CHANGELOG in release notes [ci skip] | Prathamesh Sonpatki | 2016-02-17 | 1 | -0/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #23726 from akshaymohite/fix-test-names-in-batches-test | Rafael França | 2016-02-17 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fix semantics of test names for finish option in batches_test | Akshay | 2016-02-17 | 1 | -2/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Fix typo | Rafael Mendonça França | 2016-02-17 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #23712 from bf4/incorrect_to_accept_json_api_and_not_rende... | Rafael França | 2016-02-17 | 2 | -10/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | The JSON API media type should only work wih a JSON API handler | Benjamin Fleischer | 2016-02-16 | 2 | -10/+3 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #23713 from collectiveidea/add-store-attributes-test | Rafael França | 2016-02-17 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Test parent local_stored_attributes isn't modified | David Genord II | 2016-02-16 | 1 | -0/+1 | |
| |/ / / / / / | ||||||
* | / / / / / | Fix code style | Rafael Mendonça França | 2016-02-17 | 1 | -3/+4 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | adds --skip-listen to the application generator [closes #23590] | Xavier Noria | 2016-02-17 | 6 | -13/+42 | |
* | | | | | | Merge pull request #23661 from meinac/add_gzip_mime_type | Richard Schneeman | 2016-02-16 | 3 | -1/+6 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | application/gzip added as default mime type into mime type list | Mehmet Emin İNAÇ | 2016-02-13 | 3 | -1/+6 | |
* | | | | | | | Merge pull request #23705 from chi6rag/master | Vipul A M | 2016-02-17 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [ci skip] Updating edge rails guides to include `on_weekday?` on Date, Time a... | Chirag Aggarwal | 2016-02-17 | 1 | -1/+5 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #23203 from vipulnsward/22979-show-tags-on-exception | Richard Schneeman | 2016-02-16 | 3 | -12/+16 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | WIP: Errors in logs should show log tags as well. | Vipul A M | 2016-02-12 | 3 | -12/+16 | |
* | | | | | | | Merge pull request #23630 from akshaymohite/correct-test-name-api-only | Yves Senn | 2016-02-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Correct config option from only_api to api_only in test | Akshay | 2016-02-12 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
* | | | | | | | fix class name typo. | Yves Senn | 2016-02-16 | 2 | -3/+3 | |
* | | | | | | | Merge pull request #23614 from georgemillo/foreign_key | Yves Senn | 2016-02-16 | 3 | -2/+23 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Let t.foreign_key use the same `to_table` twice | George Millo | 2016-02-15 | 3 | -2/+27 | |
* | | | | | | | | reset `ActionMailer::Base.deliveries` in `ActionDispatch::IntegrationTest`. | Yves Senn | 2016-02-16 | 5 | -4/+73 | |
* | | | | | | | | Merge pull request #23692 from abhishekjain16/docs | Yves Senn | 2016-02-16 | 3 | -3/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Use a URL instead of an URL everywhere | Abhishek Jain | 2016-02-15 | 3 | -3/+3 |