aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #25864 from vipulnsward/fix-ap-testRafael França2016-07-171-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix failing requirement of duplicable in ParameterFilterVipul A M2016-07-161-0/+2
* | | | | | | | | | | Merge pull request #25850 from ojab/layout_doc_fixRafael Mendonça França2016-07-171-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Mention that layout can call a Proc [ci skip]ojab2016-07-151-1/+4
* | | | | | | | | | | Merge pull request #25861 from vipulnsward/fix-grammerRafael França2016-07-171-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix CHANGELOG grammar [ci skip]Vipul A M2016-07-161-2/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #25860 from prathamesh-sonpatki/add-cg-for-rails-initializersRafael França2016-07-173-3/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | CHANGELOG for https://github.com/rails/rails/pull/25257 [ci skip]Prathamesh Sonpatki2016-07-173-3/+16
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #25815 from greysteil/add-newline-between-structure-versionsRafael França2016-07-162-2/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add newline between each migration in `structure.sql`Grey Baker2016-07-142-2/+9
* | | | | | | | | | | | Merge pull request #25775 from junaruga/hotfix/actionpack-depending-on-active...Eileen M. Uchitelle2016-07-161-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove unused activerecord requirement in actionpack.Jun Aruga2016-07-111-1/+0
* | | | | | | | | | | | | Merge pull request #25854 from prathamesh-sonpatki/fix-test-nameEileen M. Uchitelle2016-07-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix wrong test namePrathamesh Sonpatki2016-07-161-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #25853 from CodingItWrong/remove-reference-indexes-in-docsVipul A M2016-07-161-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update references generation docs to exclude indexJosh Justice2016-07-161-2/+2
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #25851 from y-yagi/add_missing_bracesVipul A M2016-07-151-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | add missing braces [ci skip]yuuji.yaginuma2016-07-161-2/+2
* | | | | | | | | | | | | Merge pull request #25826 from javan/actionview/trim-digestor-template-lookupsRafael França2016-07-151-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Eliminate extra template lookup in ActionView::DigestorJavan Makhmali2016-07-141-2/+1
* | | | | | | | | | | | | Merge pull request #25845 from znz/fix-broken-linkArun Agrawal2016-07-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix broken linkKazuhiro NISHIYAMA2016-07-151-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #25844 from tyamagu2/empty_typoप्रथमेश Sonpatki2016-07-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | [ci skip] fix a typoYamaguchi.Tomoki2016-07-151-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #25831 from rbr/patch-1Vipul A M2016-07-141-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix display of unsorted list in release notes of 5.0 [ci skip]rbr2016-07-141-3/+3
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #25816 from greysteil/check-path-param-encodingAaron Patterson2016-07-146-29/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Check `request.path_parameters` encoding at the point they're setGrey Baker2016-07-146-29/+35
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #25829 from geshafer/fix-typo-in-mailer-previews-testClaudio B2016-07-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix typo in mailer previews test description [ci skip]Gale Shafer2016-07-141-1/+1
|/ / / / / / / / / / /
* | | | | | | / / / / fixes a link in the release notes of 5.0 [ci skip]Xavier Noria2016-07-141-1/+1
| |_|_|_|_|_|/ / / / |/| | | | | | | | |
* | | | | | | | | | small reword [ci skip]Xavier Noria2016-07-141-3/+3
* | | | | | | | | | finders guide: updates the section about batch processing [ci skip]Xavier Noria2016-07-141-15/+38
| |_|_|_|_|/ / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #25798 from greysteil/dont-raise-unknown-http-method-low-i...Matthew Draper2016-07-143-3/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't raise ActionController::UnknownHttpMethod from ActionDispatch::StaticGrey Baker2016-07-133-3/+21
* | | | | | | | | | Merge pull request #25817 from javan/fix-namespaced-implicit-render-etag-temp...Rafael França2016-07-133-11/+46
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix adding implicitly rendered namespaced template digests to ETagsJavan Makhmali2016-07-133-11/+46
* | | | | | | | | | | Merge pull request #25771 from kaspth/make-test-response-assign-response-parserKasper Timm Hansen2016-07-134-57/+72
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Let TestResponse assign a parser.Kasper Timm Hansen2016-07-104-57/+72
* | | | | | | | | | | | removes a unnecessary limit callXavier Noria2016-07-131-1/+0
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | adds support for limits in batch processingXavier Noria2016-07-134-54/+220
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #25799 from greysteil/wrap-rack-params-exceptionsMatthew Draper2016-07-143-2/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Handle `Rack::QueryParser` errors in `ActionDispatch::ExceptionWrapper`Grey Baker2016-07-123-2/+14
* | | | | | | | | | | Merge pull request #25795 from mechanicles/command-importanceGuillermo Iguaran2016-07-132-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Give importance to rails command in the comment section.Santosh Wadghule2016-07-132-2/+2
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #25748 from CodingItWrong/generator-field-types-linkVipul A M2016-07-131-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Correct link for model generator field typesJosh Justice2016-07-131-1/+1
* | | | | | | | | | | Merge pull request #25790 from mrageh/wrap-lazy-load-hooks-in-moduleRafael França2016-07-131-18/+26
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Wrap module around lazy load hooksmrageh2016-07-121-18/+26
* | | | | | | | | | | Remove old test that check duplicated items in the load pathRafael Mendonça França2016-07-131-16/+0