aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #20471 from y-yagi/add_instantiation_to_instrumentation_guideZachary Scott2015-06-071-0/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add `instantiation.active_record` hook to instrumentation guide [ci skip]
| * | | | | | | add `instantiation.active_record` hook to instrumentation guide [ci skip]yuuji.yaginuma2015-06-081-0/+14
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | the hook was added in 2a0d97bc89fc230241453cbbf55621309e1f3ac6
* | | | | | | Merge pull request #20472 from Coaxial/patch-1Zachary Scott2015-06-071-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Add missing NOTE for Time extensions' location
| * | | | | | Add missing NOTE for Time extensions' locationPierre2015-06-071-0/+2
|/ / / / / /
* | | | | | Merge pull request #20448 from sgrif/sg-postgresql-point-typeSean Griffin2015-06-076-11/+189
|\ \ \ \ \ \ | | | | | | | | | | | | | | Return a `Point` object from the PG Point type
| * | | | | | Return a `Point` object from the PG Point typeSean Griffin2015-06-056-11/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a deprecation cycle to change the behavior of the default point type in the PostgreSQL adapter. The old behavior will continue to be available for the immediate future as `:legacy_point`. The current behavior of returning an `Array` causes several problems, the most significant of which is that we cannot differentiate between an array of points, and a point itself in the case of a column with the `point[]` type. The attributes API gives us a reasonable way to have a proper deprecation cycle for this change, so let's take advantage of it. If we like this change, we can also add proper support for the other geometric types (line, lseg, box, path, polygon, and circle), all of which are just aliases for string today. Fixes #20441
* | | | | | | Merge pull request #20464 from ronakjangir47/active_support_stubbingArthur Nogueira Neves2015-06-0710-309/+366
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Removed mocha stubbing in active_support
| * | | | | | | Removed mocha stubbing in active_supportRonak Jangir2015-06-0710-309/+366
| | |/ / / / / | |/| | | | |
* | | | | | | Tiny documentation edits [ci skip]Robin Dupret2015-06-073-4/+7
| | | | | | |
* | | | | | | Merge pull request #20004 from rusikf/patch-1Robin Dupret2015-06-071-0/+31
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | add docs to include option at ActiveModel::Serialization [ci skip]
| * | | | | | add docs to include option at ActiveModel::Serialization#serializable_hash ↵rusikf2015-05-111-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | A few documentation tweaks [ci skip]Robin Dupret2015-06-079-14/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [Robin Dupret & Shunsuke Aida]
* | | | | | | Merge pull request #20462 from yui-knk/fix/guide3Robin Dupret2015-06-071-1/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | [ci skip] Declare `product` as `_product partial`
| * | | | | | [ci skip] Declare `product` as `_product partial`yui-knk2015-06-071-1/+2
|/ / / / / /
* | | | | | Merge pull request #20456 from akihiro17/fix-bug-reportRafael Mendonça França2015-06-066-6/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | Show an error message if bundler 1.10.x is not installed when reporting bugs
| * | | | | | Output an error message and raise an error if bundler 1.10.x is not ↵akihiro172015-06-066-6/+36
|/ / / / / / | | | | | | | | | | | | | | | | | | installed when reporting bugs
* | | | | | Merge pull request #20423 from Erol/remove-assets-version-documentationRafael Mendonça França2015-06-061-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove `config.assets.version` from Configuring Rails Application Guide
| * | | | | | Remove reference to assets version option.Erol Fornoles2015-06-031-2/+0
| | | | | | |
* | | | | | | Merge pull request #20444 from y-yagi/can_use_path_helper_method_in_consoleRafael Mendonça França2015-06-062-0/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | modify console of app method in that can use the path helpers
| * | | | | | | modify console of app method in that can use the path helpersyuuji.yaginuma2015-06-052-0/+17
| |/ / / / / /
* | | | | | | Merge pull request #20452 from repinel/add-bug-report-templates-to-ciRafael Mendonça França2015-06-056-17/+49
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add the bug report templates to the Travis CI build
| * | | | | | | Add the bug report templates to the Travis CI buildRoque Pinel2015-06-056-17/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug report templates are now executed from the `ci/travis.rb` when `GEM` contains `guides`. I started by creating a `test` task in `guides/Rakefile` to handle this, but since inline `gemfile` must not be executed with `bundle exec`, that rake task would not be consistent with others. So I went back by executing them directly from `Build`. Use inline Gemfile dependency when reporting gem bugs
* | | | | | | | Merge pull request #20442 from arunagw/aa-remove-warning-eager-loadRafael Mendonça França2015-06-051-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Remove warning for setting eager_load
| * | | | | | | Remove warning for setting eager_loadArun Agrawal2015-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AppTemplate::Application.new does not run load hooks. To load this configuration we need to use create which will run load hooks to load this configuration.
* | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-06-055-8/+8
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | [ci skip] Add `.`yui-knk2015-06-011-1/+1
| | | | | | | |
| * | | | | | | [ci skip] Upcase `is`yui-knk2015-05-251-1/+1
| | | | | | | |
| * | | | | | | [ci skip] Fix typo you/yourclaudiob2015-05-231-1/+1
| | | | | | | |
| * | | | | | | [ci skip] Upcase `when`yui-knk2015-05-161-1/+1
| | | | | | | |
| * | | | | | | [ci skip] Fix to a singular form (person has one contact_detail)yui-knk2015-05-161-2/+2
| | | | | | | |
| * | | | | | | [ci skip] Upcase `SAVEPOINT`yui-knk2015-05-121-1/+1
| | | | | | | |
| * | | | | | | [ci skip] Fix comment indentyui-knk2015-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See commit 890da514, this is not intended. So fix indent.
* | | | | | | | Merge pull request #20443 from teoljungberg/thoughtbot-capitalizationKasper Timm Hansen2015-06-051-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | [ci skip] Fix `thoughtbot` capitalization
| * | | | | | | Fix `thoughtbot` capitalizationTeo Ljungberg2015-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The company name is spelled `thoughtbot` per https://github.com/thoughtbot/presskit/blob/master/README.md#name
* | | | | | | | Merge pull request #20429 from repinel/improve-bug-report-templateRafael Mendonça França2015-06-043-33/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ci skip] Use inline Gemfile dependency when reporting bugs
| * | | | | | | | Use inline Gemfile dependency when reporting bugsRoque Pinel2015-06-033-33/+18
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With Bundler `1.10.3`, it is possible to list the gems inline without the need to create a `Gemfile` if none is found in the current directory.
* | | | | | | | Merge pull request #20439 from jimmycuadra/require-as-durationArthur Nogueira Neves2015-06-041-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Require active_support/duration.
| * | | | | | | Require active_support/duration.Jimmy Cuadra2015-06-041-0/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport::TimeWithZone references `ActiveSupport::Duration` but does not require it, which can result in a `LoadError` when required directly without requiring a component less granular like `active_support/time`, where the autoload for `ActiveSupport::Duration` is set up.
* | | | | | | Merge pull request #20427 from ronakjangir47/http_pathYves Senn2015-06-041-9/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Removed duplicate test cases for template execution
| * | | | | | | Removed duplicate test cases for template execution Ronak Jangir2015-06-041-9/+0
| |/ / / / / /
* | | | | | | Merge pull request #20430 from georgeclaghorn/tighten-up-suppressionRafael Mendonça França2015-06-042-3/+33
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Apply Active Record suppression to all saves
| * | | | | | Apply Active Record suppression to all savesGeorge Claghorn2015-06-042-3/+33
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was not being applied to creates and updates attempted through the non-bang save methods. This means that, for example, creation of records for singular associations through the `create_*` methods was not appropriately ignored in .suppress blocks.
* | | | | | Document config.action_mailer.deliver_later_queue_nameRafael Mendonça França2015-06-032-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a CHANGELOG entry for #18587 [ci skip]
* | | | | | Merge pull request #18587 from ↵Rafael Mendonça França2015-06-035-1/+33
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | chrismcg/allow_deliver_later_queue_name_to_be_configured Allow configuration of ActionMailer queue name
| * | | | | Allow configuration of ActionMailer queue nameChris McGrath2015-06-025-1/+33
| | | | | |
* | | | | | pass check_ip and proxies to GetIp constructorAaron Patterson2015-06-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `GetIp` class doesn't need to keep a reference to the middleware, so there is no reason to pass the middleware instance to the `GetIp` class
* | | | | | Merge pull request #20421 from repinel/fix-clear-guides-and-related-api-docsRafael Mendonça França2015-06-032-8/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] fix the `collection.clear` guide
| * | | | | | [ci skip] fix the `collection.clear` guideRoque Pinel2015-06-022-8/+15
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the guide about `has_many` `collection.clear` to indicate the behavior for each dependent strategy according to `collection.delete_all`. Based on #17179, I changed the `collection.delete` docs to also clarify the default strategy for each `hm` and `hm:t` associations. Fixes #20170.
* | | | | | Revert "Merge pull request #19685 from vngrs/actionview_parent_layout_bug"Rafael Mendonça França2015-06-022-31/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a9d58c77da800bb0052c9bfa432828b02526022c, reversing changes made to 041c2c879a3c4086ad3aa6d30fed1eede1d53c11. Reason: The old behavior is how it was working in previous version of Rails since 4.0.x so it is not safe to backport to a stable branch. See https://github.com/rails/rails/issues/19626#issuecomment-89862258 and https://github.com/rails/rails/pull/15050#issuecomment-45333449
* | | | | | Merge pull request #20383 from jonatack/fix-configurable-static-index-filenameSantiago Pastorino2015-06-021-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix regression in #20017 wrong number of arguments error
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 10:49:58 +0000