Sean Griffin
753da21322
Merge pull request #25280 from kamipo/prevent_range_error_for_belongs_to_associations
...
Prevent `RangeError` for `belongs_to` associations
2016-12-10 06:21:55 -05:00
Sean Griffin
2e8dad6318
Merge pull request #25227 from kamipo/numeric_value_out_of_range
...
Translate numeric value out of range to the specific exception
2016-12-10 06:20:34 -05:00
Matthew Draper
5a5474325f
Merge pull request #27320 from y-yagi/run_webpack_command_only_when_webpack_option_is_specified
...
run `webpack` command only when webpack option is specified
2016-12-10 12:41:13 +10:30
yuuji.yaginuma
c2c840fa6b
run webpack
command only when webpack option is specified
2016-12-10 10:46:24 +09:00
Yuji Yaginuma
c16296c795
gemfile entry method need to return an empty array rather than nil ( #27318 )
...
This fixes the following error when executing rails new command.
```
(erb):9:in `block in template': undefined method `comment' for nil:NilClass (NoMethodError)
```
Follow up to #27288
2016-12-09 16:21:28 -08:00
David Heinemeier Hansson
ecddc0468d
Use GitHub webpacker until closer to release
2016-12-09 13:33:45 -08:00
David Heinemeier Hansson
8c947eb6e9
Basic --webpack delegation to new webpacker gem ( #27288 )
2016-12-09 12:19:43 -08:00
Matthew Draper
1399d5c1e0
Merge pull request #27314 from kamipo/add_changelog_for_25451
...
Add a changelog entry for #25451 [ci skip]
2016-12-10 06:22:17 +10:30
Ryuta Kamizono
3190aab84d
Add a changelog entry for #25451 [ci skip]
2016-12-10 04:42:19 +09:00
Rafael Mendonça França
4eb3ef812c
Do not raise exception when content_type is a empty string
...
When content type header is blank we were raising an exception because
`empty?` was being called on nil.
2016-12-09 14:39:43 -05:00
Sean Griffin
a9d72f6e47
Merge pull request #27248 from stefanmb/master
...
Idempotent option for after_commit :destroy callback
2016-12-09 13:48:52 -05:00
Stefan Budeanu
371c083fb0
Emulate db trigger behaviour for after_commit :destroy, :update
...
Race conditions can occur when an ActiveRecord is destroyed
twice or destroyed and updated. The callbacks should only be
triggered once, similar to a SQL database trigger.
2016-12-09 11:14:37 -05:00
Guillermo Iguaran
872faa9583
Show message if Yarn is not installed ( #27312 )
2016-12-09 07:46:28 -08:00
Kasper Timm Hansen
cfc126e150
Merge pull request #27311 from y-yagi/remove_assert_send
...
remove deprecated `assert_send` from assertion list [ci skip]
2016-12-09 10:59:51 +01:00
yuuji.yaginuma
7fab05008c
remove deprecated assert_send
from assertion list [ci skip]
...
`assert_send` was deprecated in minitest 5.10.0.
Ref: f95ef007ec
2016-12-09 16:12:56 +09:00
David Heinemeier Hansson
c873746c50
Only have Yarn bundling commented out as we cant be sure Yarn is installed
2016-12-08 19:49:30 -08:00
David Heinemeier Hansson
8d99c896e0
Fix ability to run railties test suite
2016-12-08 19:49:30 -08:00
Yuji Yaginuma
23f99ed7eb
fix broken tests ( #27308 )
...
Follow up to 0d20530e5edfd7d00fbc2a38ef5f87eca6ccc924
2016-12-08 19:08:13 -08:00
Yuji Yaginuma
fbd33b911a
specify skip_yarn
option in API-only Application ( #27309 )
2016-12-08 19:07:40 -08:00
Matthew Draper
81608cda9c
Merge pull request #27303 from toshimaru/fix/partial-variable-block
...
Enable `block` variable in view
2016-12-09 09:50:54 +10:30
Matthew Draper
847e9dd5c1
Resolve association class correctly when assigning ids on a through association
2016-12-09 09:32:07 +10:30
Rafael Mendonça França
0951306ca5
Make ActiveModel::Errors backward compatible with 4.2
...
If a Error object was serialized in the database as YAML in the Rails
4.2 version, if we load in the Rails 5.0 version it will miss the
@details instance variable so methods like #clear and #add will start to
fail.
2016-12-08 16:27:47 -05:00
Sean Griffin
deaaf80524
Merge pull request #27304 from utilum/fix_test_breaker
...
Fix test breaking error uninitialized constant ActiveRecord::Type::Value
2016-12-08 16:01:58 -05:00
utilum
ecb6eee0d2
Fix test breaking error uninitialized constant ActiveRecord::Type::Value.
2016-12-08 21:46:17 +01:00
Toshimaru
d9ff835b99
split DELEGATION_RESERVED_METHOD_NAMES in half
2016-12-09 05:21:11 +09:00
Toshimaru
7407d35c54
Enable block
variable in view
...
Remove `block` keyword from reserved method names
2016-12-09 05:21:02 +09:00
Sean Griffin
a0aad0381a
Merge pull request #25051 from bf4/extract_notes_as_binary
...
Extract notes as binary
2016-12-08 13:51:02 -05:00
Sean Griffin
ef76f83f4c
Merge pull request #26696 from iainbeeston/only-ruby-types-in-activemodel
...
Moved database-specific ActiveModel types into ActiveRecord
2016-12-08 13:45:47 -05:00
Sean Griffin
6e948f4801
Merge pull request #26529 from prathamesh-sonpatki/fix-alias-attribute-issue
...
Check whether the current attribute being read is aliased or not before reading
2016-12-08 13:41:36 -05:00
David Heinemeier Hansson
0d20530e5e
Make Yarn the default, drop default vendor/asset directories ( #27300 )
2016-12-08 10:33:23 -08:00
Prathamesh Sonpatki
44dc4f6645
Check whether the current attribute being write is aliased or not before writing
...
- If aliased, then use the aliased attribute name.
2016-12-09 00:00:50 +05:30
Prathamesh Sonpatki
9cbf54c81a
Check whether the current attribute being read is aliased or not before reading
...
- If aliased, then use the aliased attribute name.
- Fixes #26417 .
2016-12-08 23:59:10 +05:30
Sean Griffin
17b09f4fca
Merge pull request #27278 from kamipo/should_be_sync_primary_key_definition
...
Should be sync the `primary_key` definition with actually created
2016-12-08 13:15:13 -05:00
Sean Griffin
e2933a7e38
Add some documentation around internal APIs [ci skip]
...
While these method aren't public API, they are a non-trivial internal
API which warrant a bit of explanation.
2016-12-08 13:13:51 -05:00
Sean Griffin
55ebf6c1ac
Merge pull request #27185 from kamipo/fix_apply_seconds_precision
...
Fix `apply_seconds_precision` not to be affected by `mathn`
2016-12-08 13:04:39 -05:00
Matthew Draper
3f279977ea
Merge pull request #27289 from matthewd/fixture-file-module
...
Only move fixture_file_upload to IntegrationTest
2016-12-08 07:30:12 +10:30
Matthew Draper
42b873f2d8
Merge pull request #27271 from printercu/permantent_digest_in_tests
...
Don't clear digest cache in test environment
2016-12-08 01:29:54 +10:30
Kasper Timm Hansen
ab2483c72a
Merge pull request #27290 from lastgabs/active-model-docs
...
Fix ActiveModel::Model API documentation [ci skip]
2016-12-07 08:44:51 +01:00
Gabi Stefanini
b970ade252
Add Action View to Active Model API documentation
...
In Rails 4.1, Action View was extracted from Action Pack, but this
change was not reflected in the API documentation of ActiveModel::Model.
This commits makes it explicit in the documentation that Active Model
also interacts with Action View as well as Action Pack.
[ci skip]
2016-12-06 22:37:25 -05:00
Gabi Stefanini
f3d0762d6c
Fixes API wording to match API conventions
...
In ActiveModel::Model API documentation, referrences to Rails
components were tagged with fixed-width font and named as if
they were modules.This fixes the inconsistency to match API
documentation conventions.
[ci skip]
2016-12-06 22:36:49 -05:00
Matthew Draper
8d0aa19771
Only move fixture_file_upload to IntegrationTest
...
The rest of the helpers are better placed on Session -- and this is the
only one that cares which class it is defined on.
2016-12-07 14:03:57 +10:30
Max Melentiev
238035409e
Fixed usage of cache_template_loading
...
It disables recompilation of templates on every request in test env.
2016-12-06 23:36:47 +03:00
Sean Griffin
09b2e29fc6
Merge pull request #27251 from ebeigarts/fix-autosave
...
Fix association scope inside autosaved association callbacks
2016-12-06 15:30:52 -05:00
Sean Griffin
91ae6e86da
Merge pull request #27286 from alexcameron89/document_recent_regex_change
...
[ci skip] Document regex change
2016-12-06 15:22:14 -05:00
Alex Kitchens
809d08496a
[ci skip] Document regex change
2016-12-06 11:58:50 -06:00
Matthew Draper
a8380f12db
Merge pull request #27285 from MSP-Greg/MSP-Greg_doc1
...
ActionCable::Connection::Base doc code sample syntax error
2016-12-07 03:18:15 +10:30
MSP-Greg
7257306623
ActionCable::Connection::Base doc code sample syntax error
2016-12-06 10:35:36 -06:00
Ryuta Kamizono
49edce37f9
Translate numeric value out of range to the specific exception
...
Raise `ActiveRecord::RangeError` when values that executed are out of range.
2016-12-06 21:30:25 +09:00
Sean Griffin
cf6c2948d5
Merge pull request #25451 from kamipo/translate_not_null_violation_to_specific_exception
...
Translate NOT NULL violation to the specific exception
2016-12-06 07:06:32 -05:00
Sean Griffin
5a44a01c7b
Merge pull request #27275 from kamipo/should_inherit_statement_invalid
...
Should inherit `StatementInvalid` rather than `WrappedDatabaseException`
2016-12-06 05:14:32 -05:00