aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | Merge pull request #20734 from srikanthps/masterRafael Mendonça França2015-06-291-1/+2
|\ \ \ | | | | | | | | To fix #20644
| * | | To fix #20644Srikanth Shreenivas2015-06-301-1/+2
| | | | | | | | | | | | Added a note on development kit for Windows Users. This is required as Windows users can get frustrated when their first rails project creation would fail as some native gem won't get built.
* | | | Merge pull request #20739 from jordondornbos/patch-1Rafael Mendonça França2015-06-291-1/+1
|\ \ \ \ | | | | | | | | | | fix pluralization in doc [ci skip]
| * | | | fix pluralization in doc [ci skip]Jordon Dornbos2015-06-291-1/+1
|/ / / /
* | | | Merge pull request #20735 from vngrs/minor_addition_to_getting_startedSean Griffin2015-06-291-2/+2
|\ \ \ \ | | | | | | | | | | Minor addition to getting started guide for foreign_key description
| * | | | Minor addition to getting started guide for foreign_key description of ↵Mehmet Emin İNAÇ2015-06-291-2/+2
|/ / / / | | | | | | | | | | | | references migration [ci skip]
* | | | docs, nodoc `NullPreloader` and `AlreadyLoaded`.Yves Senn2015-06-291-2/+2
| | | | | | | | | | | | | | | | | | | | These classes are part of Active Record Preloader, which is not part of the public API.
* | | | Merge pull request #20724 from y-yagi/fix_scaffold_in_full_engineYves Senn2015-06-297-3/+36
|\ \ \ \ | | | | | | | | | | | | | | | fix NoMethodError that occurs when generating scaffold inside full mode engine
| * | | | fix NoMethodError that occurs when generating scaffold inside full mode engineyuuji.yaginuma2015-06-287-3/+36
| | | | |
* | | | | Merge pull request #20669 from akolomiychuk/image-pathYves Senn2015-06-293-0/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Passing nil to image_tag
| * | | | | Add nil check in asset_pathAnton Kolomiychuk2015-06-292-0/+7
| | | | | |
* | | | | | Merge pull request #20538 from repinel/fix-render-caching-issueKasper Timm Hansen2015-06-294-16/+36
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Fix cache issue when different partials use the same collection
| * | | | | Fix cache issue when different partials use the same collectionRoque Pinel2015-06-284-16/+36
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the `virtual_path` option to `cache_fragment_name` so it can be provided when needed. That allows `cache_collection_render` to get the appropriate cache key with the digest generated based on the template and prevent collision with other templates that cache the same collection.
* | | | | Merge pull request #20726 from yui-knk/fix/doc_controllerClaudio B.2015-06-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] Fix action_controller_overview
| * | | | | [ci skip] Fix action_controller_overviewyui-knk2015-06-281-1/+1
|/ / / / /
* | | | | updates a migration example in the Getting Started guide [ci skip]Xavier Noria2015-06-281-5/+3
| | | | | | | | | | | | | | | | | | | | Closes #20705.
* | | | | Revert the behavior of association names and `where` to be closer to 4.2Sean Griffin2015-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change, we will always assume the association name is the same as the table it's referencing. This is subtly different than treating the hash key passed to `where` as the table name, as it still allows the class referenced by the association to provide additional type information. After exploring several possible solutions to the ambiguity problem, I do not think there is a short term answer that will maintain backwards compatibility. This change will make it so the following code does not work: class User has_many :approved_posts, -> { where(approved: true) }, class_name: "Post" end User.where(approved_posts: { id: 1 }) But prevents potential ambiguity and collision as demonstrated in [this gist](https://gist.github.com/senny/1ae4d8ea7b0e269ed7a0). Unfortunately, truely solving this requires significantly re-architecting this code, so that what is currently represented as an `Arel::Attribute` is instead another data structure that also references the association it is representing, so we can identify the proper table name for aliasing when we construct the final tree. While I'd still like to accomplish that in the long run, I don't think I'll be able to get there in time for Rails 5 (since I'm not full time OSS any more, and this is several weeks worth of work). I'm hoping to achieve this for Rails 5.1. Fixes #20308
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 09:33:01 +0000