aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Support explicit defintion of resouce name for collection caching.Dov Murik2015-07-075-9/+47
| | | | | | | | | | | | | | If a template includes `# Template Collection: ...` anywhere in its source, that name will be used as the cache name for the partial that is rendered for the collection. This allows users to enable collection caching even if the template doesn't start with `<% cache ... do %>`. Moreover, the `# Template Collection: ...` notation is recognized in all template types (and template types other than ERB can define a resource_cache_call_pattern method to allow the `cache ... do` pattern to be recognized too).
* Revert "Merge pull request #20758 from ↵Kasper Timm Hansen2015-07-074-25/+9
| | | | | | | xijo/action_mailer_message_delivery_respects_i18n_locale" This reverts commit f2a8c23654d69dd8f294971487b5abf0e5d891c3, reversing changes made to 3046c9bbe154aa717a5147091be8b495ed8969c4.
* Fix regression caused by a01d164bRafael Mendonça França2015-07-073-2/+37
| | | | | | | | | When preload is used in a default scope the preload_values were returning nested arrays and causing the preloader to fail because it doesn't know how to deal with nested arrays. So before calling preload! we need to splat the arguments. This is not needed to includes because it flatten its arguments.
* docs, clarify the meanaing of return values from validation methods.Yves Senn2015-07-072-2/+6
| | | | | | | | | | [ci skip] Closes #20792. Custom validation methods are implemented in terms of callbacks. The `validate` callback chain can't be halted using return values of individual callbacks.
* docs, remove accidental :nodoc: of ActiveModel::Validations::ClassMethods ↵Yves Senn2015-07-071-2/+1
| | | | | | | | | | | | | | | | | | | | | methods. [ci skip] While this :nodoc: did hide the constant it also removed the following methods from the API docs: - #attribute_method? - #clear_validators! - #validate - #validators - #validators_on Those are public API and should be visible. Issue was caused by dee4fbc /cc @zzak
* Merge pull request #20794 from vredniy/patch-1Robin Dupret2015-07-071-1/+1
|\ | | | | Update CHANGELOG.md [ci skip]
| * Update CHANGELOG.mdDmitry Zudochkin2015-07-071-1/+1
|/
* Merge pull request #20793 from pwnall/nested_testYves Senn2015-07-071-0/+10
|\ | | | | Test proving that accepts_nested_attributes_for is secure against ID tampering attacks
| * Add test proving that accepts_nested_attributes_for is secure against ID ↵Victor Costan2015-07-071-0/+10
|/ | | | tampering attacks.
* Merge pull request #13897 from gmalette/nested-parameter-filtering-2Arthur Nogueira Neves2015-07-063-7/+28
|\ | | | | Allow filtering params based on parent keys
| * Allow filtering params based on parent keysGuillaume Malette2015-06-223-7/+28
| | | | | | | | | | | | | | | | | | | | Add the possibility to only filter parameters based on their full path instead of relying on the immediate key. config.filter_parameters += ['credit_card.code'] { 'credit_card' => { 'code' => '[FILTERED]' }, 'source' => { 'code' => '<%= puts 5 %>' } }
* | Merge pull request #20779 from maurogeorge/secrets-guidesRobin Dupret2015-07-061-0/+23
|\ \ | | | | | | Add to Security guides the secrets.yml [ci skip]
| * | Add to Security guides the secrets.ymlMauro George2015-07-061-0/+23
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #20778 from maurogeorge/ordered_options_bang_docRobin Dupret2015-07-061-0/+8
|\ \ \ | | | | | | | | Add to RDoc of OrderedOptions the bang info [ci skip]
| * | | Add to RDoc of OrderedOptions the bang infoMauro George2015-07-061-0/+8
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #20767 from y-yagi/remove_unnecessary_fixture_methodYves Senn2015-07-061-4/+0
|\ \ \ \ | | | | | | | | | | remove unnecessary loading fixtures from `navigation_test.rb`
| * | | | remove unnecessary loading fixtures from `navigation_test.rb`yuuji.yaginuma2015-07-031-4/+0
| |/ / / | | | | | | | | | | | | | | | | it has been corrected in 0176aef1ebaa9f69001c7045a51727a8ea9b61b8 as for loading of fixtures in `test_helper.rb`, loading fixtures for each test is unnecessary.
* | | | Merge pull request #20758 from ↵Kasper Timm Hansen2015-07-054-9/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | xijo/action_mailer_message_delivery_respects_i18n_locale ActionMailer::MessageDelivery respects current I18n.locale
| * | | | ActionMailer::MessageDelivery respects current I18n.localeJohannes Opper2015-07-054-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When #deliver_now is called all translations within the generated email will be looked up for the current I18n locale. I18n.locale = ‘de’ mail.deliver_now # Generates german email, correct In #enqueue_delivery the locale was not considered and the resulting job uses the default locale. I18n.locale = ‘de’ mail.deliver_later # Generate english email, incorrect In order to achieve a consistent behaviour the current locale is now always passed to `ActionMailer::DeliveryJob`.
* | | | | Merge pull request #20782 from kaspth/fix-controller-caching-testMatthew Draper2015-07-061-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix the random caching test failure. (Take two)
| * | | | | Fix the random caching test failure.Kasper Timm Hansen2015-07-051-0/+1
| | | | | |
* | | | | | Merge pull request #20748 from robin850/reserved-namesEileen M. Uchitelle2015-07-054-4/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Display a more human readable list of reserved names
| * | | | | | Display a more human readable list of reserved namesRobin Dupret2015-07-014-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Interpolating an array inside a String will call #inspect on it. Let's call #join to display a more human-readable error message.
* | | | | | | Refactor cookie_jar to decouple it from request objecteileencodes2015-07-051-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change decouples `cookie_jar` allocation from the request object. We need this for moving controller tests to integration tests so we can access the `cookie_jar` object separately.
* | | | | | | Add gemfile entry for GlobalID until a new release is cut.Kasper Timm Hansen2015-07-052-3/+12
| | | | | | |
* | | | | | | Merge pull request #19877 from fny/job-global-id-error-improvementKasper Timm Hansen2015-07-052-7/+21
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Improve error message when serializing unsaved records for jobs, Fixes #19861
| * | | | | | Improve error message when serializing unsaved records for jobsFaraz Yashar2015-06-282-7/+21
| | | | | | |
* | | | | | | Merge pull request #20780 from y-yagi/action_view_overview_guideRobin Dupret2015-07-051-8/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | remove reference to `country_options_for_select` and `country_select` from guide [ci skip]
| * | | | | | remove reference to `country_options_for_select` and `country_select` from ↵yuuji.yaginuma2015-07-051-8/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guide [ci skip] these methods were removed in 2d27b82d4cf446543539ad20afcbad256d8aeff7
* | | | | | Merge pull request #20764 from maurogeorge/mailer_imageVijay Dev2015-07-041-0/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Create Adding images in Action Mailer Views on guides
| * | | | | | Create Adding images in Action Mailer Views on guidesMauro George2015-07-031-0/+18
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #20773 from jonatack/distinct-instead-of-deprecated-uniqKasper Timm Hansen2015-07-031-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | [skip ci] #distinct instead of #uniq
| * | | | | | [skip ci] #distinct instead of #uniqJon Atack2015-07-031-2/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as #uniq will be removed from Rails 5.0 as per the Active Support exception raised: ActiveSupport::DeprecationException: DEPRECATION WARNING: uniq is deprecated and will be removed from Rails 5.0 (use distinct instead).
* | | | | | Merge pull request #20766 from trosborn/diversityRafael Mendonça França2015-07-022-8/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | changes names in guides to better reflect diversity
| * | | | | changes names in guides to better reflect diversity [ci-skip]Thomas Osborn2015-07-022-8/+8
|/ / / / /
* | | | | Fix spelling of `Thoughtleadering`eileencodes2015-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | Not much of a thought leader if I can't spell it correctly :wink:
* | | | | Use default model enum in fixtures if not definedeileencodes2015-07-023-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After 908cfef was introduced fixtures that did not set an enum would return nil instead of the default enum value. The fixtures should assume the default if a different enum is not defined. The change checks first if the enum is defined in the fixture before setting it based on the fixture.
* | | | | Merge pull request #20760 from claudiob/remove-true-false-classXavier Noria2015-07-021-6/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | [ci skip] Don't use TrueClass, FalseClass in docs
| * | | | [ci skip] Don't use TrueClass, FalseClass in docsclaudiob2015-07-021-6/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sort of documentation style comes from 2009, probably due to the merging of merb (see https://github.com/rails/rails/commit/38b608ecab2441cd0c4e75bc08bdf57fcf85dd71#diff-017d9bc9b1d2bdae199b938d72c15488R120). Rails follows Ruby's convention to define which values are "truthy" or "falsey", so there is no need to specify that the returned value must strictly be a TrueClass or FalseClass. /cc @fxn
* | | | Merge pull request #20631 from repinel/improve-url-for-docsRobin Dupret2015-07-011-3/+19
|\ \ \ \ | |_|/ / |/| | | [ci skip] Improve the url_for documentation
| * | | [ci skip] Improve the url_for documentationRoque Pinel2015-07-011-3/+19
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Clarify the `url_for` usage in mailers. Re-add the documentation about `url_for` and Route's path parameters, first introduced by 5c4f1859970d06228a0b67cad6d4486c1526ef2a. This was reported on #15097 and until it is decided to deprecate it or not, I believe the documentation should exist.
* | | Separate the constraint and other options [ci skip]Robin Dupret2015-07-011-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only one constraint option can be used at a time (except for the minimum and maximum ones that can eventually be combined). However, other options can be used with them (e.g. the validation failure message). So let's make the distinction between these two different options categories. [Yves Senn, Matthew Draper & Robin Dupret]
* | | Merge pull request #20747 from pwnall/fix_minitest_railsKasper Timm Hansen2015-07-011-3/+3
|\ \ \ | | | | | | | | Avoid crashing when minitest-rails is loaded.
| * | | Avoid crashing when minitest-rails is loaded.Victor Costan2015-07-011-3/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | The improvments to the test runner's integration with minitest in commit b6fc8e25a10cc4abdd03018798b180270d6c5d7f add methods to the Minitest module that refer to the Rails module. Unfortunately, when the minitest-rails gem is loaded, the reference is incorrectly resolved to the Minitest::Rails module.
* | | Correct through associations using scopesSean Griffin2015-06-304-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes introduced to through associations in c80487eb were quite interesting. Changing `relation.merge!(scope)` to `relation = relation.merge(scope)` should in theory never cause any changes in behavior. The subtle breakage led to a surprising conclusion. The old code wasn't doing anything! Since `merge!` calls `instance_exec` when given a proc, and most scopes will look something like `has_many :foos, -> { where(foo: :bar) }`, if we're not capturing the return value, it's a no-op. However, removing the `merge` causes `unscope` to break. While we're merging in the rest of the chain elsewhere, we were never merging in `unscope` values, causing a breakage on associations where a default scope was being unscoped in an association scope (yuk!). This is subtly related to #20722, since it appears we were previously relying on this mutability. Fixes #20721. Fixes #20727.
* | | follow-up to 2183caa, always reenable the task. #20743Yves Senn2015-06-301-3/+3
| | |
* | | `dump_schema_after_migration` applies migration tasks other than db:migrateYves Senn2015-06-303-15/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #20743. The task `db:_dump` now only dumps the schema if `ActiveRecord::Base.dump_schema_after_migration` is true. This has effects: - `db:migrate:up` - `db:migrate:down` - `db:forward` - `db:rollback`
* | | tests, railties tests should use `bin/` executables when possible.Yves Senn2015-06-309-121/+121
| | | | | | | | | | | | | | | We recommend using the `bin/` executables in our docs and guides. Let's make sure that our tests execute the same code path.
* | | Merge pull request #20741 from radar/integration_tool_docRafael Mendonça França2015-06-301-1/+1
|\ \ \ | | | | | | | | Improve integration_tool documentation
| * | | integration_tool defaults to :test_unitRyan Bigg2015-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per railties/lib/rails/test_unit/railtie.rb, where it sets it explicitly. This can be confirmed by starting a new Rails console session in a new app and running this code: Rails.application.config.app_generators.rails[:integration_tool] I also beefed up the documentation slightly to be more explicit about what this configuration setting does.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 09:15:32 +0000