aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove useless `target_records_from_association`Ryuta Kamizono2017-05-041-11/+3
| | | | Since through association is always loaded by `preloader.preload`.
* Merge pull request #28976 from kamipo/should_test_bound_attributesRafael França2017-05-031-8/+12
|\ | | | | Should test against `Relation#bound_attributes`
| * Should test against `Relation#bound_attributes`Ryuta Kamizono2017-05-041-8/+12
|/ | | | Since legacy `Relation#bind_values` was removed in b06f64c.
* Merge pull request #28974 from kamipo/extract_bind_param_and_bind_attributeRafael França2017-05-0311-51/+38
|\ | | | | Extract `bind_param` and `bind_attribute` into `ActiveRecord::TestCase`
| * Extract `bind_param` and `bind_attribute` into `ActiveRecord::TestCase`Ryuta Kamizono2017-05-0411-51/+38
| | | | | | | | These are used in tests from anywhere.
* | Merge pull request #28975 from ↵Rafael França2017-05-031-9/+0
|\ \ | |/ |/| | | | | kamipo/remove_duplicated_test_merging_reorders_bind_params Remove duplicated `test_merging_reorders_bind_params`
| * Remove duplicated `test_merging_reorders_bind_params`Ryuta Kamizono2017-05-041-9/+0
|/ | | | | | The same test exists in `test/cases/relation/merging_test.rb`. https://github.com/rails/rails/blob/v5.1.0/activerecord/test/cases/relation/merging_test.rb#L94-L101
* Merge pull request #28967 from stve/active-model-validator-kind-examplesRyuta Kamizono2017-05-031-2/+2
|\ | | | | fix ActiveModel::Validator#kind code examples
| * fix ActiveModel::Validator#kind code examples [ci skip]stve2017-05-021-2/+2
|/
* Merge pull request #28966 from stve/active-model-uniqueness-validatorsGuillermo Iguaran2017-05-022-5/+4
|\ | | | | remove uniqueness validators from ActiveModel examples [ci-skip]
| * remove uniqueness validators from ActiveModel examplesstve2017-05-022-5/+4
| |
* | Merge pull request #28961 from maclover7/jm-fix-28959Rafael França2017-05-025-3/+13
|\ \ | |/ |/| Add type caster to `RuntimeReflection#alias_name`
| * Add type caster to `RuntimeReflection#alias_name`Jon Moss2017-05-025-3/+13
| | | | | | | | | | Since we have been using this `Arel::Table` since 111ccc832bc977b15af12c14e7ca078dad2d4373, in order to properly handle queries, it's important that we properly type cast arguments.
* | Merge pull request #28835 from fphilipe/masterRafael França2017-05-021-0/+1
|\ \ | |/ |/| Add missing require in ActionMailer::Base
| * Add missing require in ActionMailerPhilipe Fatio2017-05-021-0/+1
| | | | | | | | | | | | | | | | | | Without this, Action Mailer doesn't work like it used to on version 4. The following snippet fails since version 5: > require 'action_mailer' > ActionMailer::Base NameError: uninitialized constant ActiveSupport::Rescuable
* | Merge pull request #28956 from bdewater/patch-1Kasper Timm Hansen2017-05-021-1/+1
|\ \ | | | | | | Rails secrets is not built on but inspired by Sekrets
| * | Rails secrets is not built on but inspired by SekretsBart2017-05-021-1/+1
|/ / | | | | Put wording in line with http://weblog.rubyonrails.org/2017/4/27/Rails-5-1-final/
* | Merge pull request #28938 from kamipo/deprecate_supports_statement_cacheRafael França2017-05-016-22/+12
|\ \ | | | | | | Deprecate `supports_statement_cache?`
| * | Deprecate `supports_statement_cache?`Ryuta Kamizono2017-05-016-22/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `supports_statement_cache?` was introduced in 3.1.0.beta1 (104d0b2) for bind parameter substitution, but it is no longer used in 3.1.0.rc1 (73ff679). Originally it should respect `prepared_statements` rather than `supports_statement_cache?` (fd39847). One more thing, named `supports_statement_cache?` is pretty misreading. We have `StatementCache` and `StatementPool`. However, `supports_statement_cache?` doesn't mean `StatementCache`, but `StatementPool` unlike its name. https://github.com/rails/rails/blob/v5.1.0/activerecord/lib/active_record/statement_cache.rb https://github.com/rails/rails/blob/v5.1.0/activerecord/lib/active_record/connection_adapters/statement_pool.rb
* | | Merge pull request #28930 from kamipo/use_flat_mapRafael França2017-05-012-3/+3
|\ \ \ | | | | | | | | Use `flat_map` rather than `map(&:...).flatten`
| * | | Use `flat_map` rather than `map(&:...).flatten`Ryuta Kamizono2017-04-292-3/+3
| | | |
* | | | Merge pull request #28943 from koshigoe/port-arg-has-precedence-over-env-varRafael França2017-05-012-2/+15
|\ \ \ \ | | | | | | | | | | CLI arg `--port` has precedence over env `PORT`
| * | | | CLI arg `--port` has precedence over env `PORT`.koshigoe2017-05-012-2/+15
| | |/ / | |/| |
* | | | Merge pull request #28753 from st0012/add-render-with-variants-testKasper Timm Hansen2017-05-013-0/+10
|\ \ \ \ | | | | | | | | | | Add tests for rendering with variants
| * | | | Add tests for render template/partial with variants option.Stan Lo2017-04-143-0/+10
| | | | |
* | | | | Merge pull request #28939 from kirs/maintain_test_schema_friendlyAndrew White2017-05-011-1/+6
|\ \ \ \ \ | | | | | | | | | | | | Friendly maintain schema error in test runner
| * | | | | Friendly maintain schema failureKir Shatrov2017-04-301-1/+6
| | |/ / / | |/| | |
* | | | | Merge pull request #28944 from alexcameron89/update_templatesRafael França2017-05-015-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Update the Gem Bug Report Templates to 5.1.0
| * | | | | Update the Gem Bug Report Templates to 5.1.0Alex Kitchens2017-05-015-5/+5
| |/ / / / | | | | | | | | | | | | | | | 5.1.0 has been released, and the gem templates can reflect that now.
* | | | | Merge pull request #28941 from y-yagi/remove_needless_remove_fileRafael França2017-05-011-4/+0
|\ \ \ \ \ | |/ / / / |/| | | | Remove unnecessary `package.json` deletion
| * | | | Remove unnecessary `package.json` deletionyuuji.yaginuma2017-05-011-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | The `package.json` is created only if `skip_yarn` is not specified. https://github.com/rails/rails/blob/a4c1282854795d1f0d7696ce1ccbabf94b3d9098/railties/lib/rails/generators/rails/app/app_generator.rb#L202..L204
* | | | | Remove `:doc:` in `:nodoc:` class [ci skip]Ryuta Kamizono2017-05-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | The `:doc:` was added in bc478158 but originally `UriEncoder` is a `:nodoc:` class.
* | | | | Add periodJon Moss2017-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #28936 from ↵Jon Moss2017-04-301-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dixpac/dixpac/update-docs-ActionDispatch__Journey__Router__Utils.unescape_uri Add docs for Router::Utils.unescape_uri method. [ci skip]
| * | | | | Add docs for Router::Utils.unescape_uri methoddixpac2017-04-301-0/+4
|/ / / / /
* | | | | Merge pull request #28934 from y-yagi/fix-note-about-secretsRyuta Kamizono2017-04-301-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | Fix note about `secrets.yml` [ci skip]
| * | | | Fix note about `secrets.yml` [ci skip]yuuji.yaginuma2017-04-301-3/+3
|/ / / / | | | | | | | | | | | | The `secrets` method is in `Application` class, not `Configuration` class.
* | | | Cleanup CHANGELOGs [ci skip]Ryuta Kamizono2017-04-308-25/+29
| | | | | | | | | | | | | | | | | | | | | | | | * Remove trailing spaces. * Add backticks around method and command. * Fix indentation.
* | | | Merge pull request #28924 from y-yagi/fix-release-noteRafael França2017-04-291-10/+0
|\ \ \ \ | |_|/ / |/| | | Remove entries included in 5.0 [ci skip]
| * | | Remove entries included in 5.0 [ci skip]yuuji.yaginuma2017-04-291-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | * `Permit same-origin connections by default` was backported in db70978, 549d732. * `Deprecated `:controller` and `:action` path parameters` was included in 6520ea5. * `Exception handling: use `rescue_from` was included in 6b54316.
* | | | Merge pull request #28923 from maclover7/jm-structRafael França2017-04-281-23/+15
|\ \ \ \ | |/ / / |/| | | Stop creating duplicate Struct instances
| * | | Stop creating duplicate Struct instancesJon Moss2017-04-281-23/+15
|/ / / | | | | | | | | | | | | | | | Just use one `Event` class. Reduces duplication, makes the tests easier to read. It might seem like each tests needs a different kind of Struct, since we make a new one for each test case.
* | | Merge pull request #28920 from eugeneius/require_remove_methodRafael França2017-04-281-0/+1
|\ \ \ | | | | | | | | Add missing require for `remove_possible_method`
| * | | Add missing require for `remove_possible_method`Eugene Kenny2017-04-281-0/+1
|/ / / | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/505537082849d912e8e29819655b80a573e93c0c added a call to `remove_possible_method`, but didn't require the file that defines it.
* | | 5.1 Release Notes are complete [ci skip]claudiob2017-04-281-1/+0
| | | | | | | | | | | | @prathamesh-sonpatki added the last missing commits in #28911.
* | | Small grammar fixJon Moss2017-04-271-1/+1
| | | | | | | | | | | | [ci skip]
* | | Small grammar fixJon Moss2017-04-271-1/+1
| | | | | | | | | | | | [ci skip]
* | | Small grammar fixesJon Moss2017-04-271-13/+13
| | | | | | | | | | | | | | | | | | Will backport to 5-1-stable, since the original PR landed there. [ci skip]
* | | Merge pull request #28913 from prathamesh-sonpatki/fix-indentRafael França2017-04-271-22/+22
|\ \ \ | | | | | | | | Fix indentation [ci skip]
| * | | Fix indentation [ci skip]Prathamesh Sonpatki2017-04-271-22/+22
|/ / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 07:36:36 +0000