| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|\
| |
| | |
3-2-stable documentation: the possibility to use a hash of hashes for nested attributes
|
|/
|
|
|
|
| |
Document the possibility to use a hash of hashes for nested attributes for a one-to-many association (in addition to the documented possibility to use an array of hashes).
Align indentation in comments.
|
|\
| |
| | |
Backport: Correctly parse bigint defaults in PostgreSQL
|
|/
|
|
|
|
|
|
| |
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
activerecord/test/cases/schema_dumper_test.rb
|
|\
| |
| |
| |
| | |
* 3-2-later:
adding test for CVE
|
| | |
|
| | |
|
|\ \
| | |
| | | |
Fix explicit names on multiple file fields
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
If a file field tag is passed the multiple option, it is turned into an
array field (appending "[]"), but if the file field is passed an
explicit name as an option, leave the name alone (do not append "[]").
Fixes #9830
|
| |
| |
| |
| | |
Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428
|
| |
| |
| |
| | |
Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428
|
|\ \
| | |
| | | |
Fixes Issue #7490: Chained scopes will preload properly
|
| | | |
|
| | |
| | |
| | |
| | | |
and PartialRenderer
|
| | |
| | |
| | |
| | | |
Sentences starting with # are considered headings.
|
| | |
| | |
| | |
| | |
| | | |
This was brought up in #9995, but is only present in 3-2-stable, since
mass assignment is removed from Rails 4.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is causing a regression since the Active Record Railtie is trying to
connect to the development database in the application boot.
See https://github.com/rails/rails/pull/6197#issuecomment-15199273
|
|\ \ \
| | | |
| | | | |
Fixed test failures on 1.8.7 caused by 74e59ea
|
|/ / / |
|
|\ \ \
| | | |
| | | |
| | | |
| | | | |
fredwu/backport_fix_explicitly_inheraitance_column_to_3_2_stable
[Backport to 3-2-stable] Don't reset inheritance_column when setting explicitly.
|
| | | | |
|
|/ / /
| | |
| | | |
This is backported from master (cdfcbc4).
|
|\ \ \
| | | |
| | | | |
Backport #5808
|
|/ / /
| | |
| | |
| | |
| | |
| | | |
df36c5f - Fix assert_template assertion with :layout option
4bd05a7 - Fix assert_template :layout => nil assertion
0d19a08 - Improve assert_template layout checking
|
|\ \ \
| | | |
| | | | |
use ruby 1.8 Hash syntax [ci skip]
|
|/ / / |
|
|\ \ \
| | | |
| | | | |
do not reset associations when preloading twice.
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Closes #9806.
As the `through_options` always contained `{:order=>nil}` the second time,
the preloader ran, the association was always reset. This patch only
adds the `:order` to the `through_options` if it is set.
|
| | |
| | |
| | |
| | | |
Pathname doesn't respond to to_path
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* 3-2-stable:
Merge pull request #9802 from newsline/fix-broken-action-missing
Remove bad changelog entry from AR [ci skip]
Wrong exception is occured when raising no translatable exception
Don't crash exception translation w/ nil result attribute.
Conflicts:
actionpack/CHANGELOG.md
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix missing action_missing
Conflicts:
actionpack/CHANGELOG.md
Conflicts:
actionpack/test/controller/base_test.rb
Fixes #9799
|
| | | |
| | | |
| | | |
| | | | |
Introduced in dc2bc388bc8c6c345337052bf0d60f5243d899d4.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
activerecord/CHANGELOG.md
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Exception.result is nil when attempting a query after PostgreSQL
disconnect, resulting in new exception:
NoMethodError: undefined method `error_field' for nil:NilClass
|
| | | | |
|
|/ / /
| | |
| | |
| | |
| | | |
The PR #8756 uses Sprockets for resolving files that already exists on disk, for those files their extensions don't need to be rewritten.
Fixes #9803
|
| | | |
|
|\ \ \
| | | |
| | | | |
Reset postgreSQL search path in db:test:clone_structure.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This patch resets the postgres search path in the structure.sql after
the structure is dumped in order to find schema_migrations table when
multiples schemas are used.
Fixes #945
|
|\ \ \ \
| |/ / /
|/| | | |
Backport #9347 to rails 3.2
|
|/ / / |
|
|\ \ \
| | | |
| | | | |
Change @env_config to @app_env_config
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Moral of the story: One must be careful about lazily initializing
instance variables when subclassing.
I would like to draw your attention to https://github.com/rails/rails/issues/4652 where
the reader will see that there appears to be some kind of initialization issue
in rails.
The source of this issue is that:
1) Engine#env_config contains "@env_config ||= ..."
2) Application#env_config contains "@env_config ||= ..."
3) Threads are in the picture
4) Thread A calls Application#env_config, which super's to Engine#env_config
5) After Engine#env_config returns but before Application#env_config sets @env_config again, Thread B begins running
6) Thread B calls Application#env_config
7) Thread B finds @env_config to contain a value (the one set by Engine#env_config) and returns it
8) Thread B blows up because key set by Application#env_config are there.
9) People report bugs with puma, thin, rainbows, webrick, etc
10) Evan becomes tired of seeing these bugs
11) Evan pours himself a stiff drink, puts on Top Gear(tm), and begins debugging
12) Evan finds the source of the bug
13) Evan authors a PR
14) RIGHT NOW.
The bug is fixed by simply using a different ivar name in the methods.
Alternately, Engine#env_config could just return a new Hash each time, not memoizing into @env_config.
I bid you adieu.
|
|\ \ \
| | | |
| | | | |
Add release dates to documentation [ci skip]
|
|/ / /
| | |
| | |
| | | |
Set "March 18, 2013" as the release date for 3.2.13
|
| | | |
|
| | | |
|
| | | |
|