aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | move env access to the request object.Aaron Patterson2015-08-053-16/+48
* | | | | | routes in the env via the request objectAaron Patterson2015-08-052-3/+6
* | | | | | allocate a request object to avoid hash allocationsAaron Patterson2015-08-052-3/+6
* | | | | | Add missing HelloJob require.Kasper Timm Hansen2015-08-051-0/+1
* | | | | | Use exist? instead of deprecated exists?Kasper Timm Hansen2015-08-051-2/+2
* | | | | | Merge pull request #20961 from ccallebs/add-dev-mode-cachingKasper Timm Hansen2015-08-057-2/+114
|\ \ \ \ \ \
| * | | | | | Add rake dev:cache task to enable dev mode caching.Chuck Callebs2015-08-047-2/+114
* | | | | | | Merge pull request #21112 from kamipo/fix_mysql2_versionRafael Mendonça França2015-08-041-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Should use `server_info[:version]` instead of `info[:version]`Ryuta Kamizono2015-08-041-1/+1
* | | | | | | Merge pull request #20800 from xijo/make_active_job_locale_awareKasper Timm Hansen2015-08-0411-2/+111
|\ \ \ \ \ \ \
| * | | | | | | Fixes #20799Johannes Opper2015-08-0411-2/+111
* | | | | | | | Merge pull request #21076 from r11runner/guide-join-tablesClaudio B.2015-08-032-10/+21
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | [ci skip] migration and association guides: added some remarks about join tablesr11runner2015-08-042-10/+21
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #21105 from os97673/allow-minitest-pluginsRafael Mendonça França2015-08-031-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Allow Minitest to load plugins. Fixes #21102Oleg Sukhodolsky2015-08-031-0/+1
* | | | | | | | Merge pull request #21109 from vngrs/update_javascript_manifest_docKasper Timm Hansen2015-08-032-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Inform user to add script in correct location into the application.js manifes...Mehmet Emin İNAÇ2015-08-032-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #21087 from vngrs/fix_hash_except_docKasper Timm Hansen2015-08-031-8/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix the documentation of Hash#except method [ci skip]Mehmet Emin İNAÇ2015-08-031-8/+9
* | | | | | | | | Revert "test runner should crash with non existing file argument."Yves Senn2015-08-032-6/+1
* | | | | | | | | Correctly close a fenced code block [ci skip]Robin Dupret2015-08-031-0/+1
* | | | | | | | | Add note to routing guide about overriding defaults [ci skip]Andrew White2015-08-031-0/+2
* | | | | | | | | Merge pull request #21052 from robin850/caching-guideKasper Timm Hansen2015-08-032-51/+160
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve the "Caching with Rails" guide's introduction [ci skip]claudiob2015-08-031-2/+14
| * | | | | | | | | Add a section about "Collection caching" [ci skip]Robin Dupret2015-08-031-0/+23
| * | | | | | | | | Publish the "Caching with Rails" guide [ci skip]Celestino Gomes2015-07-281-0/+4
| * | | | | | | | | Add a "Managing dependencies" part to the caching guide [ci skip]Robin Dupret2015-07-281-0/+87
| * | | | | | | | | Tiny edits to the "Caching with Rails" guideRobin Dupret2015-07-281-49/+32
* | | | | | | | | | Merge pull request #21104 from atul-shimpi/masterYves Senn2015-08-032-2/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Inform user to add styles in correct location in application.cssatul-shimpi2015-08-032-2/+4
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | test runner should crash with non existing file argument.Yves Senn2015-08-032-1/+6
* | | | | | | | | | Merge pull request #21095 from aditya-kapoor/add-missing-assertionYves Senn2015-08-031-2/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add missing assertion for test_route_with_colon_firstAditya Kapoor2015-08-031-2/+4
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #21103 from mikeastock/update_time_advance_docsYves Senn2015-08-031-0/+6
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | [ci skip] Update Time#advance documentation with examplesMichael Stock2015-08-021-0/+6
| |/ / / / / / / /
* | | | | | | | | Merge pull request #21093 from vngrs/fix_ambiguous_argument_warningKasper Timm Hansen2015-08-021-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix ambiguous argument warningMehmet Emin İNAÇ2015-08-021-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #21100 from bquorning/route-setRichard Schneeman2015-08-021-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use #start_with? and #[] for speedBenjamin Quorning2015-08-021-2/+2
* | | | | | | | | | Merge pull request #21098 from bquorning/shovel-twice-and-save-a-stringRichard Schneeman2015-08-021-3/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Save a string allocation inside loopBenjamin Quorning2015-08-021-3/+8
|/ / / / / / / / /
* | | | | | | | | Merge pull request #21097 from y-yagi/fix_button_to_exampleArun Agrawal2015-08-021-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | correct example of button_tag [ci skip]yuuji.yaginuma2015-08-021-1/+1
|/ / / / / / / /
* | | | | | | | Fix test failures caused by #20884Sean Griffin2015-08-011-1/+3
* | | | | | | | Merge pull request #20884Sean Griffin2015-08-016-0/+137
|\ \ \ \ \ \ \ \
| * | | | | | | | Add #cache_key to ActiveRecord::Relation.Alberto F. Capel2015-07-206-0/+137
* | | | | | | | | Merge pull request #21088 from yui-knk/doc/to_paramRichard Schneeman2015-08-012-0/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ci skip]yui-knk2015-08-012-0/+29
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | docs, custom api base controllers shoudl subclass metal. [ci skip]Yves Senn2015-08-011-1/+1
* | | | | | | | | Merge pull request #21008 from svenwin/patch-1Yves Senn2015-08-011-1/+1
|\ \ \ \ \ \ \ \ \