aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | Remove github gems from the master bug report templatesRafael Mendonça França2016-02-183-15/+0
* | | | | | | | | | | | | | | push partial name regexp upAaron Patterson2016-02-181-2/+2
* | | | | | | | | | | | | | | push injected dependencies up to the `digest` methodAaron Patterson2016-02-182-9/+9
* | | | | | | | | | | | | | | use the class level digest method for calculating the digestAaron Patterson2016-02-181-3/+1
* | | | | | | | | | | | | | | cache all subnodes in the digest cacheAaron Patterson2016-02-182-9/+11
* | | | | | | | | | | | | | | Merge branch 'master' into treewipAaron Patterson2016-02-1844-92/+302
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #23756 from tenderlove/move_digest_cacheAaron Patterson2016-02-184-14/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | move digest cache on to the DetailsKey objectAaron Patterson2016-02-184-14/+28
| | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge pull request #23753 from y-yagi/skip_listen_in_dummy_appRafael França2016-02-182-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | set `skip_listen` option to dummy appplicationyuuji.yaginuma2016-02-182-0/+9
| * | | | | | | | | | | | | | remove object `hash` cacheAaron Patterson2016-02-181-6/+0
| * | | | | | | | | | | | | | Merge pull request #23750 from kamal-github/masterJon Moss2016-02-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | [ci skip] fix suggested change-replace 'an' with 'the in Rails engine guide'kamal namdeo2016-02-181-1/+1
| | * | | | | | | | | | | | | | Fix the language in engines guidekamal namdeo2016-02-181-1/+1
| | | |_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #23744 from meinac/message_verifier_docsVipul A M2016-02-181-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Missing documentation about hash algorithm option for MessageVerifier [ci skip]Mehmet Emin İNAÇ2016-02-181-0/+6
| * | | | | | | | | | | | | | Merge pull request #23747 from kamipo/add_accidentally_removed_sharpSean Griffin2016-02-171-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Add accidentally removed `#` [ci skip]Ryuta Kamizono2016-02-181-6/+6
| * | | | | | | | | | | | | | | Merge pull request #23736 from kamipo/remove_needless_case_insensitive_compar...Sean Griffin2016-02-172-7/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Remove needless `case_insensitive_comparison` in mysql2 adapterRyuta Kamizono2016-02-172-7/+4
| * | | | | | | | | | | | | | | fields_for_style needs to test for AC::ParametersAaron Patterson2016-02-172-1/+22
| * | | | | | | | | | | | | | | Fix indentation for code block in changelogEileen M. Uchitelle2016-02-171-4/+4
| * | | | | | | | | | | | | | | Merge pull request #23746 from meinac/fix_ar_change_logEileen M. Uchitelle2016-02-171-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Remove accidentally duplicated change log title [ci skip]Mehmet Emin İNAÇ2016-02-181-3/+0
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | partially revert 69009f4473637a44ade26d954ef5ddea6ff903f2Aaron Patterson2016-02-171-4/+1
| * | | | | | | | | | | | | | | Merge pull request #22365 from phuibonhoa/phuibonhoa/polymorphic_where_multip...Sean Griffin2016-02-177-6/+111
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fixed `where` for polymorphic associations when passed an array containing di...Philippe Huibonhoa2016-02-167-6/+111
| | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #23570 from rthbound/addresses-23568Matthew Draper2016-02-182-8/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Addresses #23568Ryan T. Hosford2016-02-092-8/+14
| * | | | | | | | | | | | | | Merge pull request #23730 from y-yagi/fail_fast_when_test_errorAndrew White2016-02-174-5/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | modify to `error` also abort when specify fail fast optionyuuji.yaginuma2016-02-174-5/+20
| * | | | | | | | | | | | | | Merge pull request #23732 from bquorning/actioncontroller-parameters-inspectYves Senn2016-02-173-2/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Implement ActionController::Parameters#inspectBenjamin Quorning2016-02-173-2/+15
| | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #23662 from rthbound/adds-missing-digestor-nested-deps-testsYves Senn2016-02-172-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | adds tests for Digestor#nested_dependenciesRyan T. Hosford2016-02-132-0/+12
| * | | | | | | | | | | | | | Merge pull request #23731 from y-yagi/remove_unused_methodKasper Timm Hansen2016-02-171-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | remove unused methodyuuji.yaginuma2016-02-171-4/+0
| | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #23729 from maclover7/rm-unused-journeyRafael França2016-02-172-8/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Remove unused Journey codeJon Moss2016-02-172-8/+0
| * | | | | | | | | | | | | | Merge pull request #23727 from prathamesh-sonpatki/fix-error-message-for-orRafael França2016-02-172-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Show proper error message when a non-relation object is passed to AR::Relatio...Prathamesh Sonpatki2016-02-172-0/+10
| * | | | | | | | | | | | | | | Merge pull request #23728 from prathamesh-sonpatki/add-ac-changelong-in-relas...Rafael França2016-02-171-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add Action Cable CHANGELOG in release notes [ci skip]Prathamesh Sonpatki2016-02-171-0/+1
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge pull request #23726 from akshaymohite/fix-test-names-in-batches-testRafael França2016-02-171-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Fix semantics of test names for finish option in batches_testAkshay2016-02-171-2/+2
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Fix typoRafael Mendonça França2016-02-171-1/+1
| * | | | | | | | | | | | | Merge pull request #23712 from bf4/incorrect_to_accept_json_api_and_not_rende...Rafael França2016-02-172-10/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | The JSON API media type should only work wih a JSON API handlerBenjamin Fleischer2016-02-162-10/+3
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #23713 from collectiveidea/add-store-attributes-testRafael França2016-02-171-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Test parent local_stored_attributes isn't modifiedDavid Genord II2016-02-161-0/+1
| | |/ / / / / / / / / / / /