aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix that a collection proxy could be cached before the save of the owner, res...Ben Woosley2014-10-033-1/+20
* minor fixes in the configuring guide [ci skip]Xavier Noria2014-10-031-15/+15
* Revert "Fix style for rescue responses doc [ci skip]"Xavier Noria2014-10-031-16/+15
* Merge pull request #17153 from yuki24/fix-doc-format-for-rescue-responsesAbdelkader Boudih2014-10-031-15/+16
|\
| * Fix style for rescue responses doc [ci skip]Yuki Nishijima2014-10-021-15/+16
* | Merge pull request #17151 from y-yagi/patch-1Abdelkader Boudih2014-10-031-0/+1
|\ \
| * | [ci skip] add `test:jobs` task to testing guideyuuji.yaginuma2014-10-031-0/+1
* | | Merge pull request #17148 from mgenereu/patch-1Xavier Noria2014-10-021-1/+1
|\ \ \
| * | | Disallow appended newlines when parsing as integerMichael Genereux2014-10-021-1/+1
|/ / /
* | | Merge pull request #17068 from mokhan/update-active-job-documentationAbdelkader Boudih2014-10-026-5/+64
|\ \ \
| * | | Add documentation on Active Job.mo khan2014-10-026-5/+64
|/ / /
* | | Merge pull request #17088 from robin850/jruby-devRafael Mendonça França2014-10-019-2/+12
|\ \ \
| * | | Follow up to #16613Robin Dupret2014-09-289-2/+12
* | | | Merge pull request #17125 from acrogenesis/masterXavier Noria2014-10-012-2/+2
|\ \ \ \
| * | | | use tr instead of gsub when possibleAdrian Rangel2014-10-012-2/+2
* | | | | Merge pull request #17124 from yuktikhurana/fix_render_file_guideAbdelkader Boudih2014-10-011-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | In render file, by default the current layout is rendered alwaysyuktikhurana2014-10-011-1/+1
* | | | | Merge pull request #17113 from igor04/helpers-highlightRafael Mendonça França2014-09-302-1/+5
|\ \ \ \ \
| * | | | | Added processing of `nil` to `highlight` helper methodigor042014-09-302-1/+5
| |/ / / /
* | | | | Merge pull request #17114 from pabloh/replace_use_of_eval_with_lambdaRafael Mendonça França2014-09-302-3/+5
|\ \ \ \ \
| * | | | | Refactor callback setup in to use lambda instead of evalPablo Herrero2014-09-302-3/+5
| |/ / / /
* | | | | Generate the application pointing to rails-dom-testing masterRafael Mendonça França2014-09-301-0/+2
* | | | | Merge pull request #17118 from zhangsu/patch-1Abdelkader Boudih2014-09-301-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update single table inheritance link anchorSu Zhang (張甦)2014-09-301-1/+1
|/ / / /
* | | | Merge pull request #17110 from claudiob/remove-running-testsYves Senn2014-09-301-17/+0
|\ \ \ \
| * | | | Remove RUNNING UNIT TESTS from ActionPackclaudiob2014-09-301-17/+0
|/ / / /
* | | / Responder was removed at ee77770d57de9da87b05a2fe84b9d46ec6852c62Akira Matsuda2014-09-301-1/+0
| |_|/ |/| |
* | | fixes typo in AS CHANGELOG [ci skip]Xavier Noria2014-09-291-2/+2
* | | Merge pull request #17107 from kaspth/parse-html-as-fragmentsRafael Mendonça França2014-09-296-7/+9
|\ \ \
| * | | Parse HTML as document fragment.Kasper Timm Hansen2014-09-296-7/+9
* | | | Merge pull request #17093 from phiggins/remove-dynamic-send-on-built-in-callb...Aaron Patterson2014-09-298-22/+31
|\ \ \ \ | |/ / / |/| | |
| * | | Reduce allocations when running AR callbacks.Pete Higgins2014-09-288-22/+31
* | | | Merge pull request #17099 from sferik/each_keyRafael Mendonça França2014-09-297-12/+12
|\ \ \ \
| * | | | Use Hash#each_key instead of Hash#keys.eachErik Michaels-Ober2014-09-297-12/+12
* | | | | Merge pull request #17086 from seuros/masterRafael Mendonça França2014-09-291-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | correct filename for jobs testsAbdelkader Boudih2014-09-281-1/+1
| |/ / /
* | | | Merge pull request #17092 from Empact/defunct-ivarsRafael Mendonça França2014-09-292-11/+7
|\ \ \ \
| * | | | Remove defunct ivarsBen Woosley2014-09-282-11/+7
|/ / / /
* | | | Merge pull request #17087 from taboularasa/masterRobin Dupret2014-09-282-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | technical correction in guides under 'Generating an engine'David Elliott2014-09-282-4/+4
|/ / /
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-09-285-17/+22
|\ \ \
| * | | Consistently markup etag options.Steven Harman2014-09-161-3/+3
| * | | Consistently capitalize ETag.Steven Harman2014-09-161-3/+3
| * | | [ci skip] Fix code snippet display in Action Mailer Basics guide.Juanito Fatas2014-09-161-2/+1
| * | | form_helpers: demonstrating there is also a collection_select method in form ...Thiago Pinto2014-09-131-0/+6
| * | | [ci skip] Fix some typos, normalize sentence.Juanito Fatas2014-09-081-7/+7
| * | | 'Revert' ->active_record_migrations [ci skip]Harshad Sabne2014-09-061-1/+1
| * | | 'Reversible' ->active_record_migrations [ci skip]Harshad Sabne2014-09-041-1/+1
* | | | Merge pull request #17077 from schneems/schneems/backtrace-string-allocationsJeremy Kemper2014-09-271-4/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | Move object allocation out of loopRichard Schneeman2014-09-271-4/+9