aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Avoid Ruby versions check on RubiniusRobin Dupret2015-03-021-1/+1
| | | | | Rubinius is still targeting compliance with Ruby 2.1.0 but we are pretty close to a green build so let's avoid this check for the moment.
* Test against the mail gem's edgeRobin Dupret2015-03-022-2/+9
| | | | | | | | | | The edge version ships with a patch that uses composition over inheritance for the Mail::PartsList object (see mikel/mail#782). Let's test Action Mailer against it to prevent eventual regressions and experience it. Moreover, this branch makes the Action Mailer suite green against Rubinius.
* Add the platform-specific skip helpers to ActiveModelRobin Dupret2015-03-021-0/+9
|
* Avoid accurate assertions on error messagesRobin Dupret2015-03-022-3/+3
| | | | | Since there are disparities between the raised error messages on the different implementations, let's avoid being too accurate.
* Avoid parallelizing Action Pack's tests on RubiniusRobin Dupret2015-03-021-2/+2
| | | | | | | | | | Since the `ForkingExecutor` class seems to be pretty slow on Rubinius due to DRb (c.f. http://git.io/xIVg), let's avoid running tests with it on this platform. Also, the `parallelize_me!` call make the suite to output a bunch of errors due to rubinius/rubinius#2934 since there are thread-safety problems with autoloading.
* Merge pull request #19133 from davydovanton/update-doc-example-mail-block-formatRobin Dupret2015-03-021-1/+11
|\ | | | | [ci skip] Add code example for MailHelper#block_format documentation
| * [ci skip] Add code example for MailHelper#block_format documentationAnton Davydov2015-03-021-1/+11
| |
* | Merge pull request #19168 from gsamokovarov/byebug-defaults-guideRobin Dupret2015-03-021-3/+3
|\ \ | | | | | | Nit pick the byebug settings guide for default values [ci skip]
| * | Nit pick the byebug settings guide for default values [ci skip]Genadi Samokovarov2015-03-021-3/+3
| | | | | | | | | | | | | | | In #19097 we had a discussion where we decided to change `byebug` settings sections default part to actually say `defaults`.
* | | Merge pull request #19097 from gsamokovarov/web-console-guideRobin Dupret2015-03-021-49/+58
|\ \ \ | | | | | | | | Web Console documentation for the upcoming 2.1 release [ci skip]
| * | | Web Console documentation for the upcoming 2.1 release [ci skip]Genadi Samokovarov2015-03-021-49/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the upcoming 2.1 [web-console release], I have tweaked the existing documentation a bit. I tried to focus on the spawning console use case, because I think a lot of people overlook that. Tried to explain it as best as I can, however, my English and prose aren't my best skills :) If you guys can chime in and help me improve the wording, I would be extremely grateful. There has been some configuration default changes. For example, the whitelisted IPs always include IPv4 and IPv6 localhosts now and this wasn't the case in 2.0. I think a lot of people got bitten by it, that's why I changed it. I'm a bit confused on how to document this. Should I just document the latest version, I don't think I can expect all the people reading the guide to be on it. [web-console release]: https://github.com/rails/web-console/pull/110
* | | | Merge pull request #19167 from limekin/masterArun Agrawal2015-03-021-1/+1
|\ \ \ \ | | | | | | | | | | On guides, correcting incorrect controller name used on routing.md.
| * | | | Fixing incorrect class name used in an example.Kevin Jayanthan2015-03-021-1/+1
|/ / / / | | | | | | | | On "Controller Namespaces and Routing" section of the "Rails Routing from the Outside In" , the examples are using "AritclesController" as an example of a controller, to show different organizers. But on the line 232, it incorrectly uses "PostsController" instead of "AritclesController".
* | | | Merge pull request #19163 from JuanitoFatas/feautre/enumerable-without-take-2Richard Schneeman2015-03-012-2/+1
|\ \ \ \ | | | | | | | | | | Use include? instead of in? for Enumerable#without.
| * | | | Use include? instead of in? for Enumerable#without.Juanito Fatas2015-03-022-2/+1
| | | | | | | | | | | | | | | | | | | | [egilburg]
* | | | | Merge pull request #19159 from stephenminded/docs_fix_polymorphic_indexArthur Nogueira Neves2015-03-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [docs fix] Composite index is actually [:imageable_type, :imageable_id]
| * | | | | Composite index is [:imageable_type, :imageable_id] [ci skip]Steve Lounsbury2015-03-011-1/+1
| | | | | |
* | | | | | Move transaction code to transaction moduleArthur Neves2015-03-012-41/+41
| |/ / / / |/| | | |
* | | | | Remove parent transaction stateArthur Neves2015-03-012-7/+0
| | | | | | | | | | | | | | | | | | | | As far as I can tell nobody is setting this variable.
* | | | | Merge pull request #19161 from JuanitoFatas/fix/include-inclusionDavid Heinemeier Hansson2015-03-011-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Include object inclusion for enumerable test.
| * | | | | Include object inclusion for enumerable test.Juanito Fatas2015-03-021-0/+1
|/ / / / /
* | | | | Merge pull request #19157 from todd/enumerable_withoutDavid Heinemeier Hansson2015-03-015-0/+46
|\ \ \ \ \ | | | | | | | | | | | | Add Enumerable#without
| * | | | | Add Enumerable#withoutTodd Bealmear2015-03-015-0/+46
| | | | | |
* | | | | | remove useless conditionalAaron Patterson2015-03-011-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 generationAaron Patterson2015-03-011-8/+6
| | | | | |
* | | | | | drop allocations for string and class polymorphic routesAaron Patterson2015-03-011-3/+3
| | | | | |
* | | | | | Merge pull request #19152 from tchandy/removing_unused_mailer_templatesCarlos Antonio da Silva2015-03-0118-50/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Removing unused mailer templates
| * | | | | | Removing unused mailer templatesThiago Pradi2015-03-0118-50/+0
| | | | | | |
* | | | | | | drop string allocations per model url_for call in viewsAaron Patterson2015-03-011-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`eileencodes2015-03-012-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 usedAaron Patterson2015-03-012-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_indexAbdelkader Boudih2015-03-011-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 Lounsbury2015-03-011-1/+1
|/ / / /
* | | | Merge pull request #19149 from yui-knk/fix/4_0_release_notes2Rafael Mendonça França2015-03-011-1/+1
|\ \ \ \ | | | | | | | | | | [ci skip] Fix fenced code block lang
| * | | | [ci skip] Fix fenced code block langyui-knk2015-03-021-1/+1
|/ / / /
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-03-013-3/+20
|\ \ \ \
| * | | | Explained how to set session expiry through session_store configIain Beeston2015-02-273-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_notesCarlos Antonio da Silva2015-03-011-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | [ci skip] Add `.`
| * | | | [ci skip] Add `.`yui-knk2015-03-011-1/+1
|/ / / /
* | | | Lines of code can be 100,000+ in a Rails appAkira Matsuda2015-03-011-4/+4
| | | | | | | | | | | | | | | | Actually, our app has 400,000 LOC :boom:
* | | | Fix segmentation fault in ActionPack testseileencodes2015-02-281-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_langAbdelkader Boudih2015-03-011-1/+1
|\ \ \ \ | | | | | | | | | | [ci skip] Fix fenced code block lang
| * | | | [ci skip] Fix fenced code block langyui-knk2015-03-011-1/+1
|/ / / /
* | | | Merge pull request #19137 from kant/patch-2Abdelkader Boudih2015-03-011-1/+1
|\ \ \ \ | | | | | | | | | | Update link (minor fix)
| * | | | Update link (minor fix)Darío Hereñú2015-02-281-1/+1
|/ / / /
* | | | Merge pull request #19136 from kant/patch-1Abdelkader Boudih2015-03-011-2/+2
|\ \ \ \ | | | | | | | | | | Minor fixes (proposal)
| * | | | Minor fixes (proposal)Darío Hereñú2015-02-281-2/+2
|/ / / /
* | | / drop allocations when handling model url generationAaron Patterson2015-02-281-1/+1
| |_|/ |/| |
* | | Merge pull request #19131 from ↵Yves Senn2015-02-281-1/+1
|\ \ \ | | | | | | | | | | | | | | | | tgxworld/reduce_allocated_memory_in_module_delegate Reduce allocated memory for Module#delegate.
| * | | Reduce allocated memory for Module#delegate.Guo Xiang Tan2015-03-011-1/+1
| | | |