aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | 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
| |/ / / / / /
* | / / / / / Fix code styleRafael Mendonça França2016-02-171-3/+4
| |/ / / / / |/| | | | |
* | | | | | adds --skip-listen to the application generator [closes #23590]Xavier Noria2016-02-176-13/+42
* | | | | | Merge pull request #23661 from meinac/add_gzip_mime_typeRichard Schneeman2016-02-163-1/+6
|\ \ \ \ \ \
| * | | | | | application/gzip added as default mime type into mime type listMehmet Emin İNAÇ2016-02-133-1/+6
* | | | | | | Merge pull request #23705 from chi6rag/masterVipul A M2016-02-171-1/+5
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Updating edge rails guides to include `on_weekday?` on Date, Time a...Chirag Aggarwal2016-02-171-1/+5
|/ / / / / / /
* | | | | | | Merge pull request #23203 from vipulnsward/22979-show-tags-on-exceptionRichard Schneeman2016-02-163-12/+16
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | WIP: Errors in logs should show log tags as well.Vipul A M2016-02-123-12/+16
* | | | | | | Merge pull request #23630 from akshaymohite/correct-test-name-api-onlyYves Senn2016-02-161-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Correct config option from only_api to api_only in testAkshay2016-02-121-1/+1
| |/ / / / / /
* | | | | | | fix class name typo.Yves Senn2016-02-162-3/+3
* | | | | | | Merge pull request #23614 from georgemillo/foreign_keyYves Senn2016-02-163-2/+23
|\ \ \ \ \ \ \
| * | | | | | | Let t.foreign_key use the same `to_table` twiceGeorge Millo2016-02-153-2/+27
* | | | | | | | reset `ActionMailer::Base.deliveries` in `ActionDispatch::IntegrationTest`.Yves Senn2016-02-165-4/+73
* | | | | | | | Merge pull request #23692 from abhishekjain16/docsYves Senn2016-02-163-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Use a URL instead of an URL everywhereAbhishek Jain2016-02-153-3/+3
* | | | | | | | | Merge pull request #23706 from vipulnsward/add-changelog-for-regressionYves Senn2016-02-161-2/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add missing CHANGELOG for regression fix in #18155 which fixes #13387Vipul A M2016-02-161-0/+7
* | | | | | | | | | Remove unused test controller actionAndrew White2016-02-161-5/+0
* | | | | | | | | | Merge pull request #22828 from ma2gedev/should-escape-cookieAndrew White2016-02-162-1/+21
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Join values using '; ' as per RFC specAndrew White2016-02-161-1/+1
| * | | | | | | | | Add require and move escape to private methodAndrew White2016-02-161-1/+6
| * | | | | | | | | Move test for #22828 into it's own testAndrew White2016-02-161-2/+10
| * | | | | | | | | Merge branch 'should-escape-cookie' of https://github.com/ma2gedev/rails into...Andrew White2016-02-162-1/+8
|/| | | | | | | | |
| * | | | | | | | | Escape cookie's key and value in ActionController::TestCaseTakayuki Matsubara2015-12-302-1/+8
* | | | | | | | | | fix more failing tests due to 07e422f ... :pray:Yves Senn2016-02-151-2/+2
* | | | | | | | | | fixing the build take II. :sweat:Yves Senn2016-02-151-1/+1
* | | | | | | | | | fix build broken by 07e422f58d61da0.Yves Senn2016-02-151-1/+1
* | | | | | | | | | Merge pull request #23631 from y-yagi/generate_mailer_views_in_apiYves Senn2016-02-154-4/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | generate mailer views in Rails APIyuuji.yaginuma2016-02-154-4/+20
* | | | | | | | | | | test runner, relay minitest information about the error location.Yves Senn2016-02-152-2/+2
* | | | | | | | | | | Revert "Prefer Minitest's location for test failures."Yves Senn2016-02-152-9/+3
* | | | | | | | | | | Merge pull request #23688 from meinac/guide_typo_fixEileen M. Uchitelle2016-02-153-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix small typo in Rails guides [ci skip]Mehmet Emin İNAÇ2016-02-153-3/+3
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #23687 from vipulnsward/add-on-weekdayDavid Heinemeier Hansson2016-02-154-1/+24
|\ \ \ \ \ \ \ \ \ \ \