Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #19159 from stephenminded/docs_fix_polymorphic_index | Arthur Nogueira Neves | 2015-03-01 | 1 | -1/+1 |
|\ | | | | | [docs fix] Composite index is actually [:imageable_type, :imageable_id] | ||||
| * | Composite index is [:imageable_type, :imageable_id] [ci skip] | Steve Lounsbury | 2015-03-01 | 1 | -1/+1 |
| | | |||||
* | | Move transaction code to transaction module | Arthur Neves | 2015-03-01 | 2 | -41/+41 |
| | | |||||
* | | Remove parent transaction state | Arthur Neves | 2015-03-01 | 2 | -7/+0 |
| | | | | | | | | As far as I can tell nobody is setting this variable. | ||||
* | | Merge pull request #19161 from JuanitoFatas/fix/include-inclusion | David Heinemeier Hansson | 2015-03-01 | 1 | -0/+1 |
|\ \ | | | | | | | Include object inclusion for enumerable test. | ||||
| * | | Include object inclusion for enumerable test. | Juanito Fatas | 2015-03-02 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #19157 from todd/enumerable_without | David Heinemeier Hansson | 2015-03-01 | 5 | -0/+46 |
|\ \ | | | | | | | Add Enumerable#without | ||||
| * | | Add Enumerable#without | Todd Bealmear | 2015-03-01 | 5 | -0/+46 |
| | | | |||||
* | | | remove useless conditional | Aaron Patterson | 2015-03-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | `@reflects_state[depth+1]` will always be nil because we haven't made a method call that would make it true yet. | ||||
* | | | refactor `handle_model` to use private helper methods for generation | Aaron Patterson | 2015-03-01 | 1 | -8/+6 |
| | | | |||||
* | | | drop allocations for string and class polymorphic routes | Aaron Patterson | 2015-03-01 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #19152 from tchandy/removing_unused_mailer_templates | Carlos Antonio da Silva | 2015-03-01 | 18 | -50/+0 |
|\ \ \ | | | | | | | | | Removing unused mailer templates | ||||
| * | | | Removing unused mailer templates | Thiago Pradi | 2015-03-01 | 18 | -50/+0 |
| | | | | |||||
* | | | | drop string allocations per model url_for call in views | Aaron Patterson | 2015-03-01 | 1 | -1/+1 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ```ruby article = Article.new.tap(&:save!) view.url_for article result = ObjectSpace::AllocationTracer.trace do 3000.times { view.url_for article } end p ObjectSpace::AllocationTracer.allocated_count_table[:T_STRING] / 3000 ``` | ||||
* | | | Bump rack-test to fix nil values being sent to `parse_nested_query` | eileencodes | 2015-03-01 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found that nil values were being incorrectly sent to `parse_nested_query` in Rack. Originally it was thought that Rails was doing something incorrect but it was actually rack-test. This was fixed in brynary/rack-test@4a4b2c1 and is no longer an issue. This commit bumps rack-test in Rails so changes to Rack don't cause failures. See rack/rack#813 for more information. | ||||
* | | | move _generate_paths_by_default to where it is used | Aaron Patterson | 2015-03-01 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | _generate_paths_by_default wasn't used in AD::Routing::UrlFor, so we should be able to move it where it is used in AV::Routing | ||||
* | | | Merge pull request #19153 from stephenminded/docs_fix_polymorphic_index | Abdelkader Boudih | 2015-03-01 | 1 | -1/+1 |
|\ \ \ | |/ / |/| / | |/ | [docs fix] Indexing a polymorphic assoc adds index on type and id | ||||
| * | Indexing a polymorphic assoc adds index on type and id [ci skip] | Steve Lounsbury | 2015-03-01 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #19149 from yui-knk/fix/4_0_release_notes2 | Rafael Mendonça França | 2015-03-01 | 1 | -1/+1 |
|\ | | | | | [ci skip] Fix fenced code block lang | ||||
| * | [ci skip] Fix fenced code block lang | yui-knk | 2015-03-02 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2015-03-01 | 3 | -3/+20 |
|\ | |||||
| * | Explained how to set session expiry through session_store config | Iain Beeston | 2015-02-27 | 3 | -3/+20 |
| | | | | | | | | | | | | Most session stores offer an :expire_after option, but it's largely undocumented. Cookie store also supports a number of options via rack (these used to be documented in rails 2.3) | ||||
* | | Merge pull request #19148 from yui-knk/fix/4_0_release_notes | Carlos Antonio da Silva | 2015-03-01 | 1 | -1/+1 |
|\ \ | | | | | | | [ci skip] Add `.` | ||||
| * | | [ci skip] Add `.` | yui-knk | 2015-03-01 | 1 | -1/+1 |
|/ / | |||||
* | | Lines of code can be 100,000+ in a Rails app | Akira Matsuda | 2015-03-01 | 1 | -4/+4 |
| | | | | | | | | Actually, our app has 400,000 LOC :boom: | ||||
* | | Fix segmentation fault in ActionPack tests | eileencodes | 2015-02-28 | 1 | -1/+1 |
| | | | | | | | | | | | | Introduced in f6e293e ActionPack tests began sefaulting. I found that it was the kwargs and the test causing the seg fault was missing the new default_headers argument. | ||||
* | | Merge pull request #19138 from yui-knk/fix/code_block_lang | Abdelkader Boudih | 2015-03-01 | 1 | -1/+1 |
|\ \ | | | | | | | [ci skip] Fix fenced code block lang | ||||
| * | | [ci skip] Fix fenced code block lang | yui-knk | 2015-03-01 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #19137 from kant/patch-2 | Abdelkader Boudih | 2015-03-01 | 1 | -1/+1 |
|\ \ | | | | | | | Update link (minor fix) | ||||
| * | | Update link (minor fix) | Darío Hereñú | 2015-02-28 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #19136 from kant/patch-1 | Abdelkader Boudih | 2015-03-01 | 1 | -2/+2 |
|\ \ | | | | | | | Minor fixes (proposal) | ||||
| * | | Minor fixes (proposal) | Darío Hereñú | 2015-02-28 | 1 | -2/+2 |
|/ / | |||||
* | | drop allocations when handling model url generation | Aaron Patterson | 2015-02-28 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #19131 from ↵ | Yves Senn | 2015-02-28 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | tgxworld/reduce_allocated_memory_in_module_delegate Reduce allocated memory for Module#delegate. | ||||
| * | | Reduce allocated memory for Module#delegate. | Guo Xiang Tan | 2015-03-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #19132 from davydovanton/pdate-doc-module-anonymous | Rafael Mendonça França | 2015-02-28 | 1 | -0/+7 |
|\ \ \ | | | | | | | | | [ci skip] Add code examples for Module#anonymous? documentation | ||||
| * | | | [ci skip] Add code examples for Module#anonymous? documentation | Anton Davydov | 2015-02-28 | 1 | -0/+7 |
| | | | | |||||
* | | | | Merge pull request #19130 from yui-knk/fix/active_support_core_extensions2 | Yves Senn | 2015-02-28 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | [ci skip] Fix to comment | ||||
| * | | | | [ci skip] Fix to comment | yui-knk | 2015-03-01 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #19129 from yui-knk/fix/active_support_core_extensions | Yves Senn | 2015-02-28 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | [ci skip] Fix to String | ||||
| * | | | | [ci skip] Fix to String | yui-knk | 2015-03-01 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #19128 from davydovanton/update-doc-range-to-s | Kasper Timm Hansen | 2015-02-28 | 1 | -2/+17 |
|\ \ \ \ | | | | | | | | | | | [ci skip] Update documentation for Range#to_formatted_s | ||||
| * | | | | [ci skip] Update documentation for Range#to_formatted_s | Anton Davydov | 2015-02-28 | 1 | -2/+17 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #18965 from hjoo/rake_restart | Eileen M. Uchitelle | 2015-02-28 | 4 | -0/+43 |
|\ \ \ \ | |_|/ / |/| | | | created rake restart task | ||||
| * | | | Created rake restart task. | Hyonjee Joo | 2015-02-26 | 4 | -0/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #18876. Rake restart touches `tmp/restart.txt` to restart application on next request. Updated tests and documentation accordingly. | ||||
* | | | | Merge pull request #19125 from y-yagi/testing_guide | Yves Senn | 2015-02-28 | 1 | -0/+1 |
|\ \ \ \ | |_|/ / |/| | | | add `ActiveJob::TestCase` to list of classes providing for test [ci skip] | ||||
| * | | | add `ActiveJob::TestCase` to list of classes providing for test [ci skip] | yuuji.yaginuma | 2015-02-28 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #19123 from yui-knk/fix/active_support_instrumentation2 | Guillermo Iguaran | 2015-02-28 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | [ci skip] Remove `,` | ||||
| * | | | [ci skip] Remove `,` | yui-knk | 2015-02-28 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #19124 from davydovanton/add-doc-for-is-utf8 | Guillermo Iguaran | 2015-02-28 | 1 | -0/+7 |
|\ \ \ \ | | | | | | | | | | | [skip ci] Add documentation for String#is_utf8? method |