Commit Graph

57861 Commits

Author SHA1 Message Date
Christian Blais
17141481d9 Change RangeError to a more specific ActiveModel::RangeError
The should make it easier for apps to rescue ActiveModel specific
errors without the need to wrap all method calls with a generic
rescue RangeError.
2016-05-03 14:46:49 -04:00
Kasper Timm Hansen
ac8d0d76cb Merge pull request #24832 from prathamesh-sonpatki/fix-release-notes
Release notes: Remove duplicate entries
2016-05-03 16:57:54 +02:00
Prathamesh Sonpatki
94ffebab62
Release notes: Remove duplicate entries [ci skip]
- Removed duplicate entry for collection caching.
- The entry was duplicate and the link to PR was also wrong.
- Consolidated entries for `belongs_to` required by default.
2016-05-03 09:44:03 -05:00
प्रथमेश Sonpatki
5fd17b9257 Merge pull request #24833 from Erol/fix-typo
Fix small typo in Active Record Migrations documentation
2016-05-03 06:59:19 -05:00
Erol Fornoles
2687a5e0ab Fix small typo in Active Record Migrations documentation [ci skip] 2016-05-03 19:55:45 +08:00
Eileen M. Uchitelle
0627b8b923 Merge pull request #24831 from y-yagi/remove_empty_from_changelog
remove `empty?` from CHANGELOG [ci skip]
2016-05-03 07:54:38 -04:00
yuuji.yaginuma
e86a1bd1d7 remove empty? from CHANGELOG [ci skip]
Follow up to 98264a1343fad6bb6637893a37fd571916b4158c
2016-05-03 20:49:07 +09:00
Jeremy Daer
06dc3fba46
Fix template resolver cache concurrency: "can't add a new key into hash during iteration"
Resolved by https://github.com/ruby-concurrency/concurrent-ruby/pull/529

Fixes #24627.
2016-05-02 15:05:03 -07:00
Sean Griffin
98264a1343 Do not delegate AR::Base#empty? to all
Unlike `one?` and `none?`, `empty?` has interactions with methods
outside of enumerable. It also doesn't fit in the same vein.
`Topic.any?` makes sense. `Topic.empty?` does not, as `Topic` is not a
container.

Fixes #24808
Close #24812
2016-05-02 16:36:17 -05:00
प्रथमेश Sonpatki
e0a9baa044 Merge pull request #24810 from willnet/fix-actioncable-readme
[ci skip] Fix ActionCable README
2016-05-02 09:44:27 -05:00
willnet
11d41c6ef8 [ci skip] Fix ActionCable README
default worker pool size was changed from 100 to 4 at #24376
2016-05-02 23:33:12 +09:00
Vipul A M
6bd3e867f9 Merge pull request #24807 from kamipo/add_nodoc_to_schema_creation
Add `:nodoc:` to `schema_creation` [ci skip]
2016-05-02 13:42:54 +05:30
Ryuta Kamizono
2e82ef3642 Add :nodoc: to schema_creation [ci skip]
`schema_creation` is not public API.

https://github.com/rails/rails/blob/v5.0.0.beta4/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L121
https://github.com/rails/rails/blob/v5.0.0.beta4/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb#L78
2016-05-02 13:36:37 +09:00
Sean Griffin
a4b3c78e86 Merge pull request #24713 from tomkadwill/fix_counter_cache_increment
Fix counter_cache double increment bug

Close #24183
2016-04-30 22:48:50 -06:00
willnet
0725f289e1
Replace ActionDispatch::LoadInterlock with ActionDispatch::Executor in guides [ci skip]
Guides should be updated because ActionDispatch::LoadInterlock was replaced with
ActionDispatch::Executor at #23807.
2016-04-30 19:39:38 -07:00
Kenta Murata
a678c47f6d
Fix initial value effects for sum along to ruby 2.4
Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
2016-04-30 18:33:39 -07:00
Jon Moss
46e0666bfa Merge pull request #24801 from y-yagi/fix_incorrect_module_name
fix incorrect module name [ci skip]
2016-04-30 21:23:41 -04:00
yuuji.yaginuma
0ae20627d5 fix incorrect module name [ci skip] 2016-05-01 10:05:37 +09:00
Vipul A M
285292946a Merge pull request #24798 from mrkjlchvz/mc-grammar
Fix grammar. [ci skip]
2016-05-01 01:27:55 +05:30
Mark
e19ce8bafb Fix grammar. 2016-05-01 03:52:57 +08:00
Rafael França
8ef4585303 Merge pull request #24791 from maclover7/jm-rm-ar-rails-mention
Replace `Rails.version.to_f` with Active Record
2016-04-30 16:11:24 -03:00
Vipul A M
e7de870ec7 Merge pull request #24777 from tomkadwill/action_pack_typos_3
Fix actionpack typos [ci skip]
2016-04-30 22:17:12 +05:30
Tom Kadwill
41b7b8216c Fix actionpack typos [ci skip] 2016-04-30 17:41:50 +01:00
Jon Moss
76f7da0c65 Replace Rails.version.to_f with Active Record
Rails should not be explicity mentioned within Active Record, since
railties and the Rails ecosystem is not required for use.
2016-04-30 12:32:30 -04:00
yuuji.yaginuma
151080a5f9
add #24385 to 5.0 release notes [ci skip] 2016-04-29 23:09:10 -07:00
Vipul A M
3458ad92a1
rm unused require
Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
2016-04-29 19:33:50 -07:00
Ryuta Kamizono
0eac27904e
Extract add_sql_comment! method
Refactor of #22911.

Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
2016-04-29 17:54:38 -07:00
Ryuta Kamizono
2db8514d21
Treat blank comments as no comment for indexes
Follow up of 1683410.

Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
2016-04-29 17:52:37 -07:00
yui-knk
7fc4979d4d
Migrations: move version-finding responsibility
`ActiveRecord::Migration` needn't know about migration version
compatibility lookup. Delegate it to the Compatibility module.

Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
2016-04-29 15:10:03 -07:00
Xavier Noria
bbb84a1721 restores the regexp used in String#blank?
This commit undoes 54243fe.

Reason: Further investigation has shown the benefit is not so clear
generally speaking.

There is a long discussion and several benchmarks in the PR #24658
if you are interested in the details.
2016-04-29 23:01:58 +02:00
lvl0nax
517cf249c3
Chomp: prefer String#chomp where we can for a clarity boost
Closes #24766, #24767

Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
2016-04-29 13:43:15 -07:00
Jeremy Daer
3136b17b7f
AS::Duration changelog polish
Use the updated changelog from the first merge: 7254517

References #22806, #24762.

[ci skip]
2016-04-29 13:12:00 -07:00
Jon Moss
88265a724a Merge pull request #24788 from connorshea/patch-1
Update configuring.md with colons and periods
2016-04-29 15:23:20 -04:00
Connor Shea
9a4ca7d71a Update configuring.md with colons and periods
Some configuration options started with a capital letter indicating the beginning of a sentence, which didn't makes sense without the colons. Similarly, some were missing periods at the end of their descriptions. [ci skip]
2016-04-29 13:00:39 -06:00
Rafael França
963e3e0b88 Merge pull request #24787 from connorshea/patch-1
Patch 1
2016-04-29 15:31:51 -03:00
Connor Shea
58911cccbf Consistent spelling of "gzipped" [ci skip] 2016-04-29 12:28:50 -06:00
Connor Shea
90eb3746b2 Fix typos in asset_pipeline.md [ci skip]
Per discussion in #24786.
2016-04-29 12:27:27 -06:00
Richard Schneeman
b1049e7fad Merge pull request #24786 from vipulnsward/document-gzip-assets
Document config.assets.gzip flag.
2016-04-29 13:14:30 -05:00
Vipul A M
4a5bef22da Document config.assets.gzip flag. Follow up of https://github.com/rails/sprockets-rails/pull/342.
[ci skip]
2016-04-29 22:53:59 +05:30
Vijay Dev
9d1bf059c0 Merge branch 'master' of github.com:rails/docrails
Conflicts:
	guides/source/configuring.md
2016-04-29 16:00:15 +00:00
Kasper Timm Hansen
4a446220a6 Merge pull request #24776 from prathamesh-sonpatki/aj-release-notes
Active Job: Add note about ability to configure adapters on per job basis in CHANGELOG and release notes
2016-04-29 10:35:44 +02:00
Andrew White
f0a6cce78e Merge pull request #24762 from Envek/solid_durations_2
[FIX] Change 1.week to create 1 week durations instead of 7 days durations.
2016-04-29 08:36:43 +01:00
Guillermo Iguaran
97988829eb Merge pull request #24781 from maclover7/rm-env
Remove last uses of `@env[]` and `@env[]=`
2016-04-28 23:13:07 -05:00
Prathamesh Sonpatki
1d6f012718
Active Job: Add note about ability to configure adapters on per job basis in CHANGELOG and release notes.
[ci skip]
2016-04-29 07:26:26 +05:30
Jon Moss
e0b5a773cc Remove last uses of @env[] and @env[]=
Last August (2015), @tenderlove worked to remove all `@env[]` and `@env[]=`, in
favor of using `set_header`, `get_header`, etc. (Here's an [example
commit](f16a33b68e)).

This PR should remove the last uses of these methods, and fully convert
them to the newly standardized API.
2016-04-28 20:26:58 -04:00
Rafael França
03b62b8420 Merge pull request #24653 from kbrock/kinder_locking_column
schema_load triggers 2nd schema_load (via locking)
2016-04-28 18:54:31 -03:00
Keenan Brock
ba05b3c218 test the number of times the schema is loading 2016-04-28 17:48:41 -04:00
Keenan Brock
dffbba1e2a schema_load triggers 2nd schema_load (via locking)
Currently, loading the schema (schema_load)
accesses the locking column (locking_column)
which defaults the value (reset_locking_column)
which invalidates the schema (reload_schema_from_cache)
which forces another schema load.

Good news:
The second schema_load does accesses locking_column,
but locking_column is set, so it does not reset_locking_column
and it does not trigger an infinite loop.

The solution is not invalidate the cache while default locking_column
2016-04-28 17:48:41 -04:00
Rafael França
ef5c46d2ee Merge pull request #24770 from vipulnsward/guieds-type
Pass over debugging guide
2016-04-28 18:42:31 -03:00
Tom Kadwill
c3e3577f9d Fix counter_cache double increment bug 2016-04-28 21:22:26 +01:00