aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--actionmailer/CHANGELOG.md2
-rw-r--r--actionpack/CHANGELOG.md20
-rw-r--r--actionview/lib/action_view.rb1
-rw-r--r--activemodel/lib/active_model/attribute_methods.rb2
-rw-r--r--activerecord/CHANGELOG.md2
-rw-r--r--activerecord/lib/active_record/connection_adapters/connection_specification.rb4
-rw-r--r--activesupport/CHANGELOG.md29
-rw-r--r--guides/source/4_1_release_notes.md3
-rw-r--r--guides/source/getting_started.md6
-rw-r--r--railties/lib/rails/paths.rb2
-rw-r--r--railties/test/generators/plugin_generator_test.rb6
11 files changed, 49 insertions, 28 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index fc9aefd416..1867a392eb 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -5,6 +5,8 @@
* Calling `mail()` without arguments serves as getter for the current mail
message and keeps previously set headers.
+ Fixes #13090.
+
Example:
class MailerWithCallback < ActionMailer::Base
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 944bf18113..75deba4a4f 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,6 +1,12 @@
-* Allow an absolute controller path inside a module scope
+* Allow an absolute controller path inside a module scope. Fixes #12777.
+
+ Example:
+
+ namespace :foo do
+ # will route to BarController without the namespace.
+ get '/special', to: '/bar#index'
+ end
- Fixes #12777
* Unique the segment keys array for non-optimized url helpers
@@ -10,7 +16,7 @@
This means to benefit from optimized url generation the arg needs to be
specified as many times as it appears in the path.
- Fixes #12808
+ Fixes #12808.
*Andrew White*
@@ -20,7 +26,7 @@
in the error message. Previously it would only show the contraints that were
required as part of the path.
- Fixes #13592
+ Fixes #13592.
*Andrew White*
@@ -44,7 +50,7 @@
absolute. Similarly for option redirects, if the options hash returned
contains a `:host` or `:domain` key then the path is treated as absolute.
- Fixes #7977
+ Fixes #7977.
*Andrew White*
@@ -59,7 +65,7 @@
it has been unescaped. If it is not valid then we can return early since it will
not match any file anyway.
- Fixes #13518
+ Fixes #13518.
*Andrew White*
@@ -69,7 +75,7 @@
* Converts hashes in arrays of unfiltered params to unpermitted params.
- Fixes #13382
+ Fixes #13382.
*Xavier Noria*
diff --git a/actionview/lib/action_view.rb b/actionview/lib/action_view.rb
index e272426d49..5c729345dc 100644
--- a/actionview/lib/action_view.rb
+++ b/actionview/lib/action_view.rb
@@ -23,6 +23,7 @@
require 'active_support'
require 'active_support/rails'
+require 'action_view/version'
module ActionView
extend ActiveSupport::Autoload
diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index 2da2e8ec64..ea07c5c039 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -245,7 +245,7 @@ module ActiveModel
# private
#
# def clear_attribute(attr)
- # send("#{attr}", nil)
+ # send("#{attr}=", nil)
# end
# end
def define_attribute_methods(*attr_names)
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 0de47cf4cc..efe29fbc88 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1253,7 +1253,7 @@
*John Wang*
-* Fix `add_column` with `array` option when using PostgreSQL. Fixes #10432
+* Fix `add_column` with `array` option when using PostgreSQL. Fixes #10432.
*Adam Anderson*
diff --git a/activerecord/lib/active_record/connection_adapters/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
index 049768effc..9f210c5f33 100644
--- a/activerecord/lib/active_record/connection_adapters/connection_specification.rb
+++ b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
@@ -79,7 +79,7 @@ module ActiveRecord
end
# Returns name of the database.
- # Sqlite3 expects this to be a full path or `:memory`.
+ # Sqlite3 expects this to be a full path or `:memory:`.
def database
if @adapter == 'sqlite3'
if '/:memory:' == uri.path
@@ -112,7 +112,7 @@ module ActiveRecord
#
# configurations = { "production" => { "host" => "localhost", "database" => "foo", "adapter" => "sqlite3" } }
# Resolver.new(configurations).resolve(:production)
- # # => {host: "localhost", database: "foo", adapter: "sqlite3"}
+ # # => { "host" => "localhost", "database" => "foo", "adapter" => "sqlite3"}
#
# Initialized with URL configuration strings.
#
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index fa9eb0815b..2cb1e79365 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -10,18 +10,18 @@
Time.new(1582, 10, 4).to_date.gregorian.to_s # => "1582-10-04"
This patch ensures that when the intermediate `Date` object is advanced
- to yield a new `Date` object, that the `Time` object for return is contructed
+ to yield a new `Date` object, that the `Time` object for return is constructed
with a proleptic gregorian month, date and year.
*Riley Lynch*
-* MemCacheStore should only accept a Dalli::Client, or create one.
+* `MemCacheStore` should only accept a `Dalli::Client`, or create one.
*arthurnn*
* Don't lazy load the `tzinfo` library as it causes problems on Windows.
- Fixes #13553
+ Fixes #13553.
*Andrew White*
@@ -36,10 +36,13 @@
* Fixed Float related error in NumberHelper with large precisions.
- before:
+ Before:
+
ActiveSupport::NumberHelper.number_to_rounded '3.14159', precision: 50
#=> "3.14158999999999988261834005243144929409027099609375"
- after:
+
+ After:
+
ActiveSupport::NumberHelper.number_to_rounded '3.14159', precision: 50
#=> "3.14159000000000000000000000000000000000000000000000"
@@ -365,19 +368,21 @@
The value of `PER_ENTRY_OVERHEAD` is 240 bytes based on an [empirical
estimation](https://gist.github.com/ssimeonov/6047200) for 64-bit MRI on
- 1.9.3 and 2.0. GH#11512
+ 1.9.3 and 2.0.
+
+ Fixes #11512.
*Simeon Simeonov*
* Only raise `Module::DelegationError` if it's the source of the exception.
- Fixes #10559
+ Fixes #10559.
*Andrew White*
* Make `Time.at_with_coercion` retain the second fraction and return local time.
- Fixes #11350
+ Fixes #11350.
*Neer Friedman*, *Andrew White*
@@ -443,21 +448,21 @@
* Fix return value from `BacktraceCleaner#noise` when the cleaner is configured
with multiple silencers.
- Fixes #11030
+ Fixes #11030.
*Mark J. Titorenko*
* `HashWithIndifferentAccess#select` now returns a `HashWithIndifferentAccess`
instance instead of a `Hash` instance.
- Fixes #10723
+ Fixes #10723.
*Albert Llop*
* Add `DateTime#usec` and `DateTime#nsec` so that `ActiveSupport::TimeWithZone` keeps
sub-second resolution when wrapping a `DateTime` value.
- Fixes #10855
+ Fixes #10855.
*Andrew White*
@@ -473,7 +478,7 @@
* Prevent side effects to hashes inside arrays when
`Hash#with_indifferent_access` is called.
- Fixes #10526
+ Fixes #10526.
*Yves Senn*
diff --git a/guides/source/4_1_release_notes.md b/guides/source/4_1_release_notes.md
index d2c3ba0493..c240490b7f 100644
--- a/guides/source/4_1_release_notes.md
+++ b/guides/source/4_1_release_notes.md
@@ -433,7 +433,8 @@ for detailed changes.
Request](https://github.com/rails/rails/pull/13528))
* Deprecate unused `ActiveRecord::Base.symbolized_base_class`
- and `ActiveRecord::Base.symbolized_sti_name` without replacement.
+ and `ActiveRecord::Base.symbolized_sti_name` without
+ replacement. [Commit](https://github.com/rails/rails/commit/97e7ca48c139ea5cce2fa9b4be631946252a1ebd)
### Notable changes
diff --git a/guides/source/getting_started.md b/guides/source/getting_started.md
index 0634c93712..fca6d41a1b 100644
--- a/guides/source/getting_started.md
+++ b/guides/source/getting_started.md
@@ -388,9 +388,9 @@ It's inside this class that you'll define methods that will become the actions
for this controller. These actions will perform CRUD operations on the posts
within our system.
-NOTE: There are `public`, `private` and `protected` methods in `Ruby`
-(for more details you can check on [Programming Ruby](http://www.ruby-doc.org/docs/ProgrammingRuby/)).
-But only `public` methods can be actions for controllers.
+NOTE: There are `public`, `private` and `protected` methods in Ruby,
+but only `public` methods can be actions for controllers.
+For more details check out [Programming Ruby](http://www.ruby-doc.org/docs/ProgrammingRuby/).
If you refresh <http://localhost:3000/posts/new> now, you'll get a new error:
diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index ab85ab9e3e..117bb37487 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -24,7 +24,7 @@ module Rails
#
# Notice that when you add a path using +add+, the path object created already
# contains the path with the same path value given to +add+. In some situations,
- # you may not want this behavior, so you can give +:with+ as option.
+ # you may not want this behavior, so you can give <tt>:with</tt> as option.
#
# root.add "config/routes", with: "config/routes.rb"
# root["config/routes"].inspect # => ["config/routes.rb"]
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index f5f2495e7d..932cd75bcb 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -35,6 +35,12 @@ class PluginGeneratorTest < Rails::Generators::TestCase
content = capture(:stderr){ run_generator [File.join(destination_root, "43things")] }
assert_equal "Invalid plugin name 43things. Please give a name which does not start with numbers.\n", content
+
+ content = capture(:stderr){ run_generator [File.join(destination_root, "plugin")] }
+ assert_equal "Invalid plugin name plugin. Please give a name which does not match one of the reserved rails words.\n", content
+
+ content = capture(:stderr){ run_generator [File.join(destination_root, "Digest")] }
+ assert_equal "Invalid plugin name Digest, constant Digest is already in use. Please choose another plugin name.\n", content
end
def test_camelcase_plugin_name_underscores_filenames
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 03:52:52 +0000