| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|\ \
| | |
| | | |
Fix has_many assocation w/select load after create
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If you create a new record via a collection association proxy that has
not loaded its target, and which selects additional attributes through
the association, then when the proxy loads its target, it will
inadvertently trigger a deprecation notice during attribute writing when
CollectionAssociation#merge_target_lists attempts to do its thing, since
the newly loaded records will possess attributes the created record does
not.
|
|\ \
| | |
| | | |
Backport eager autoloading fixes
|
| | |
| | |
| | |
| | |
| | |
| | | |
Without eager autoloading, these would be autoloaded
only when #preloader_for is called, which is too late
in threaded applications.
|
|/ / |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Tag the blank log line between dev requests so it's easier to filter out entire requests with grep -v without leaving a stray newline behind. Example:
# Tag asset requests so it's easy to filter them from dev logs
config.log_tags = [
-> request { :assets if request.path.starts_with?(config.assets.prefix) },
-> request { request.uuid }
]
# Watch the logs, ignoring asset requests
$ tail -100f log/development.log | grep -v assets
|
|\ \
| | |
| | | |
Accept :remote as symbol in link_to options (backport)
|
| | |
| | |
| | |
| | |
| | | |
Accept either :remote or 'remote' in both the html_options and
(url_)options hash arguments to link_to.
|
|/ / |
|
| |
| |
| |
| |
| |
| | |
can't pass :locals to #assert_template without a view test case (#3415)
Conflicts:
actionpack/CHANGELOG.md
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
senny/5920_postgres_adapter_table_with_capital_letters
postgres, quote table names when fetching the primary key (#5920)
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
|
| |
| |
| |
| | |
Count returns 0 without querying if parent is not saved
|
|\ \
| | |
| | | |
Update supported ruby versions error message in ruby_version_check.rb
|
|/ / |
|
| |
| |
| |
| |
| | |
Conflicts:
activerecord/lib/active_record/counter_cache.rb
|
| |
| |
| |
| |
| |
| |
| | |
Fix reset_counters crashing on has_many :through associations.
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/counter_cache.rb
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
prefix TemplateAssertions ivars.
Closes #7459
Conflicts:
actionpack/lib/action_controller/test_case.rb
actionpack/lib/action_view/test_case.rb
|
| |
| |
| |
| | |
resource and resources do no longer modify passed options
|
| |
| |
| |
| |
| |
| |
| |
| | |
Master branch: Fixed generated whitespace in routes when using namespaced resource.
Merge pull request #7811 from iHiD/resource_generator_routes_master
Fix the build (Broken scaffold routes test)
|
| |
| |
| |
| | |
behavior added at c53e5def08f7a289a92a8e5f79dcd7caa5c3a2fb
|
| |
| |
| |
| | |
Bump Sprockets requirements from 2.1+ to 2.2+ and let it answer "should we compile this asset?" for us.
|
|\ \
| | |
| | | |
Fix reference to code sample in Getting Started.
|
|/ /
| |
| |
| | |
Fixes #7799.
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
REBASED: fixing assert_template bug when template matches expected, but not ends with
Conflicts:
actionpack/CHANGELOG.md
actionpack/lib/action_controller/test_case.rb
|
|\ \
| | |
| | | |
Backport "Don't paramify ActionDispatch::Http::UploadedFile in tests"
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
To test uploading a file without using fixture_file_upload, a posted
ActionDispatch::Http::UploadedFile should not be paramified (just like
Rack::Test::UploadedFile).
(Rack::Test::UploadedFile and ActionDispatch::Http::UploadedFile don't
share the same API, tempfile is not accessible on
Rack::Test::UploadedFile as discussed in
https://github.com/brynary/rack-test/issues/30)
|
|\ \ \
| |/ /
|/| | |
backport 68677ffb8298105eb9d3efa26d928dd88cc5e006
|
| | | |
|
| | | |
|
|/ / |
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
logs.
Conflicts:
railties/test/application/rack/logger_test.rb
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Avoid memory leak from unflushed logs on other threads leaving tags behind.
Conflicts:
activesupport/CHANGELOG.md
activesupport/lib/active_support/tagged_logging.rb
activesupport/test/tagged_logging_test.rb
|
| |
| |
| |
| | |
the same line
|
| | |
|
|\ \
| | |
| | | |
ConnectionPool accepts spec key 'checkout_timeout' (Backport)
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Backport of #6441 cb6f83935 . Old 'wait_timeout' is still supported,
but conflicts with mysql2 using that spec key for different thing.
'checkout_timeout' can now be used taking precedence for ConnectionPool
over 'wait_timeout'.
|
|/ / |
|
|\ \
| | |
| | | |
Backport #3544 to 3-2-stable
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
Rename field_changed? to _field_changed? so that users can create a field named field
Conflicts:
activerecord/lib/active_record/core.rb
activerecord/test/cases/dirty_test.rb
|
| |
| |
| |
| |
| |
| | |
This reverts commit 54f55746a70a7091341e84236498203118a7fbb4.
Reason: the last commit fixed the failing case
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 1ac19c11792a745cd654f02dfaed8e93f95b3c70.
Conflicts:
actionpack/CHANGELOG.md
Reason: This is causing failures in the railties build.
See http://travis-ci.org/#!/rails/rails/jobs/2491787
Related with #7672
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 0693e079708a52b777f2b7872b8e3d467b880a0d.
Revert "Cache columns metadata to avoid extra while testing"
This reverts commit a82f1e3f5d11c8dfba9f4c911745ec40a7965216.
Reason: This is causing failures in the postgresql build.
See http://travis-ci.org/#!/rails/rails/builds/2485584
Related with #7675
|
|\ \
| | |
| | | |
[3-2-stable] Fix #6962. AS::TimeWithZone#strftime responds incorrectly to %:z and %::z format strings.
|
|/ /
| |
| |
| | |
format strings.
|
| |
| |
| |
| |
| | |
Conflicts:
activerecord/lib/active_record/railties/databases.rake
|
| |
| |
| |
| |
| |
| | |
Removing to_shorthand to fix #6497
Conflicts:
actionpack/CHANGELOG.md
|
| | |
|