rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \|	Merge pull request #24852 from jrafanie/fix_typos	Vipul A M	2016-05-04	8	-8/+8
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	Fix some typos in comments [ci skip]
\| * \| \| \| \| \|	Fix some typos in comments.	Joe Rafaniello	2016-05-04	8	-8/+8
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	renames ActionCable::Railtie to ActionCable::Engine	Xavier Noria	2016-05-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is an engine living in action_cable/engine.rb, convention is to call these things ::Engine. Looking at thi git history looks like the current ::Railtie was just an accident.
* \| \| \| \| \|	Merge pull request #24845 from tomkadwill/action_controller_typos	Rafael França	2016-05-04	2	-3/+3
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Fix actionpack typos [ci skip]
\| * \| \| \| \|	Fix actionpack typos [ci skip]	Tom Kadwill	2016-05-04	2	-3/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #24839 from vipulnsward/fix-bundler-ci	Rafael França	2016-05-03	4	-7/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Depend on bundler 1.11.2 on travis until bundle update discrepancy is solved on 1.12.x
\| * \| \| \| \| \|	Followup of #24835	Vipul A M	2016-05-03	4	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix failing tests
\| * \| \| \| \| \|	Depend on bundler 1.11.2 on travis until bundle update discrepancy is solved ↵	Vipul A M	2016-05-03	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	on 1.12.x
* \| \| \| \| \| \|	Check for the right exception	Rafael Mendonça França	2016-05-03	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #24835 from christianblais/activemodel/rangeerror	Rafael França	2016-05-03	4	-7/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change RangeError to a more specific ActiveModel::RangeError
\| * \| \| \| \| \|	Change RangeError to a more specific ActiveModel::RangeError	Christian Blais	2016-05-03	4	-7/+12
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \|	Merge pull request #24832 from prathamesh-sonpatki/fix-release-notes	Kasper Timm Hansen	2016-05-03	1	-10/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Release notes: Remove duplicate entries
\| * \| \| \| \| \|	Release notes: Remove duplicate entries [ci skip]	Prathamesh Sonpatki	2016-05-03	1	-10/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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.
* \| \| \| \| \| \|	Merge pull request #24833 from Erol/fix-typo	प्रथमेश Sonpatki	2016-05-03	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix small typo in Active Record Migrations documentation
\| * \| \| \| \| \| \|	Fix small typo in Active Record Migrations documentation [ci skip]	Erol Fornoles	2016-05-03	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #24831 from y-yagi/remove_empty_from_changelog	Eileen M. Uchitelle	2016-05-03	1	-2/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	remove `empty?` from CHANGELOG [ci skip]
\| * \| \| \| \| \| \|	remove `empty?` from CHANGELOG [ci skip]	yuuji.yaginuma	2016-05-03	1	-2/+1
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow up to 98264a1343fad6bb6637893a37fd571916b4158c
* \| \| \| \| \| \|	Fix template resolver cache concurrency: "can't add a new key into hash ↵	Jeremy Daer	2016-05-02	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	during iteration" Resolved by https://github.com/ruby-concurrency/concurrent-ruby/pull/529 Fixes #24627.
* \| \| \| \| \| \|	Do not delegate `AR::Base#empty?` to `all`	Sean Griffin	2016-05-02	2	-7/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \| \|	Merge pull request #24810 from willnet/fix-actioncable-readme	प्रथमेश Sonpatki	2016-05-02	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Fix ActionCable README
\| * \| \| \| \| \|	[ci skip] Fix ActionCable README	willnet	2016-05-02	1	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	default worker pool size was changed from 100 to 4 at #24376
* \| \| \| \| \|	Merge pull request #24807 from kamipo/add_nodoc_to_schema_creation	Vipul A M	2016-05-02	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `:nodoc:` to `schema_creation` [ci skip]
\| * \| \| \| \| \|	Add `:nodoc:` to `schema_creation` [ci skip]	Ryuta Kamizono	2016-05-02	1	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`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
* \| \| \| \| \|	Merge pull request #24713 from tomkadwill/fix_counter_cache_increment	Sean Griffin	2016-04-30	3	-0/+14
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix counter_cache double increment bug Close #24183
\| * \| \| \| \| \|	Fix counter_cache double increment bug	Tom Kadwill	2016-04-28	3	-0/+14
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Replace ActionDispatch::LoadInterlock with ActionDispatch::Executor in ↵	willnet	2016-04-30	4	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	guides [ci skip] Guides should be updated because ActionDispatch::LoadInterlock was replaced with ActionDispatch::Executor at #23807.
* \| \| \| \| \| \|	Fix initial value effects for sum along to ruby 2.4	Kenta Murata	2016-04-30	2	-5/+85
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* \| \| \| \| \| \|	Merge pull request #24801 from y-yagi/fix_incorrect_module_name	Jon Moss	2016-04-30	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix incorrect module name [ci skip]
\| * \| \| \| \| \| \|	fix incorrect module name [ci skip]	yuuji.yaginuma	2016-05-01	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #24798 from mrkjlchvz/mc-grammar	Vipul A M	2016-05-01	0	-0/+0
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|	Fix grammar. [ci skip]
\| * \| \| \| \| \|	Fix grammar.	Mark	2016-05-01	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #24791 from maclover7/jm-rm-ar-rails-mention	Rafael França	2016-04-30	2	-1/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace `Rails.version.to_f` with Active Record
\| * \| \| \| \| \| \|	Replace `Rails.version.to_f` with Active Record	Jon Moss	2016-04-30	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails should not be explicity mentioned within Active Record, since railties and the Rails ecosystem is not required for use.
* \| \| \| \| \| \| \|	Merge pull request #24777 from tomkadwill/action_pack_typos_3	Vipul A M	2016-04-30	2	-5/+5
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \|	Fix actionpack typos [ci skip]
\| * \| \| \| \| \| \|	Fix actionpack typos [ci skip]	Tom Kadwill	2016-04-30	2	-5/+5
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	add #24385 to 5.0 release notes [ci skip]	yuuji.yaginuma	2016-04-29	1	-0/+7
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	rm unused require	Vipul A M	2016-04-29	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* \| \| \| \| \|	Extract `add_sql_comment!` method	Ryuta Kamizono	2016-04-29	3	-20/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor of #22911. Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* \| \| \| \| \|	Treat blank comments as no comment for indexes	Ryuta Kamizono	2016-04-29	3	-6/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow up of 1683410. Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* \| \| \| \| \|	Migrations: move version-finding responsibility	yui-knk	2016-04-29	2	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`ActiveRecord::Migration` needn't know about migration version compatibility lookup. Delegate it to the Compatibility module. Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* \| \| \| \| \|	restores the regexp used in String#blank?	Xavier Noria	2016-04-29	1	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \|	Chomp: prefer String#chomp where we can for a clarity boost	lvl0nax	2016-04-29	3	-7/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #24766, #24767 Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* \| \| \| \| \|	AS::Duration changelog polish	Jeremy Daer	2016-04-29	1	-15/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the updated changelog from the first merge: 7254517 References #22806, #24762. [ci skip]
* \| \| \| \| \|	Merge pull request #24788 from connorshea/patch-1	Jon Moss	2016-04-29	1	-52/+52
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update configuring.md with colons and periods
\| * \| \| \| \| \|	Update configuring.md with colons and periods	Connor Shea	2016-04-29	1	-52/+52
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \|	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]
* \| \| \| \| \|	Merge pull request #24787 from connorshea/patch-1	Rafael França	2016-04-29	2	-3/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Patch 1
\| * \| \| \| \| \|	Consistent spelling of "gzipped" [ci skip]	Connor Shea	2016-04-29	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix typos in asset_pipeline.md [ci skip]	Connor Shea	2016-04-29	1	-2/+2
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \|	Per discussion in #24786.
* \| \| \| \| \|	Merge pull request #24786 from vipulnsward/document-gzip-assets	Richard Schneeman	2016-04-29	2	-0/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document config.assets.gzip flag.
\| * \| \| \| \| \|	Document config.assets.gzip flag. Follow up of ↵	Vipul A M	2016-04-29	2	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/rails/sprockets-rails/pull/342. [ci skip]