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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \|	Merge pull request #24457 from ↵	Jeremy Daer	2016-04-08	3	-2/+40
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	jeremy/mailer/dont-deliver-later-after-message-is-loaded Disallow calling `#deliver_later` after local message modifications.
\| * \| \| \|	Disallow calling `#deliver_later` after local message modifications.	Jeremy Daer	2016-04-07	3	-2/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	They would be lost when the delivery job is enqueued, otherwise. Prevents a common, hard-to-find bug like: ```ruby message = Notifier.welcome(user, foo) message.message_id = my_generated_message_id message.deliver_later ``` The message_id is silently lost here! Only the mailer arguments are passed to the delivery job. This raises an exception now. Make modifications to the message within the mailer method or use a custom Active Job to manage delivery instead of using #deliver_later.
* \| \| \| \|	Merge pull request #24474 from djunzu/fix_welcome_page_docs	Yves Senn	2016-04-08	1	-2/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove reference to non existing link in the welcome page [ci skip]
\| * \| \| \| \|	Remove reference to non existing link in the welcome page.	djunzu	2016-04-08	1	-2/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	modified: guides/source/getting_started.md
* \| \| \| \|	Merge pull request #24471 from swrobel/patch-1	Rafael França	2016-04-08	1	-1/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Clarify fixtures examples [ci skip]
\| * \| \| \| \|	Clarify fixtures examples [ci skip]	Stefan Wrobel	2016-04-08	1	-1/+2
\|/ / / / /
* \| \| \| \|	Merge pull request #24468 from RochesterinNYC/patch-2	Rafael França	2016-04-08	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Clarify description of `include_all_helpers` config setting's default behavior [ci skip]
\| * \| \| \| \|	Clarify description of `include_all_helpers` config setting's default ↵	James Wen	2016-04-08	1	-1/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	behavior [ci skip]
* \| \| \| \|	Merge pull request #24467 from javiervidal/20160409	Yves Senn	2016-04-08	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken link in 'Ruby on Rails 3.1 Release Notes' [ci skip]
\| * \| \| \| \|	Fix broken link in 'Ruby on Rails 3.1 Release Notes' [ci skip]	Javier Vidal	2016-04-08	1	-1/+1
\|/ / / / /
* \| \| \| \|	Use new hash syntax (#24464)	Jeroen Visser	2016-04-08	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Updated syntax * Updated tests to match syntax
* \| \| \| \|	Merge pull request #24465 from y-yagi/remove_needless_entry	Vipul A M	2016-04-08	2	-9/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	remove needless entry [ci skip]
\| * \| \| \| \|	remove needless entry [ci skip]	yuuji.yaginuma	2016-04-08	2	-9/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The option backed to `start` in da26934313a31ae530b7537aba8a7662152f4dfe.
* \| \| \| \| \|	Merge pull request #24461 from repinel/fix-etag-docs	Rafael França	2016-04-08	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes for the strong & weak ETags guide [ci skip]
\| * \| \| \| \| \|	Fixes for the strong & weak ETags guide [ci skip]	Roque Pinel	2016-04-07	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #24458 from ↵	Rafael França	2016-04-07	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	y-yagi/remove_blank_line_generated_in_appliation_mailer remove blank line generated in application_mailer.rb
\| * \| \| \| \| \|	remove blank line generated in application_mailer.rb	yuuji.yaginuma	2016-04-08	1	-1/+1
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #24335 from mabras/master	Rafael França	2016-04-07	1	-2/+0
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|	remove unused `require`
\| * \| \| \| \|	remove unused require	Mohamad Abras	2016-03-29	1	-2/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #24453 from PareshGupta/validation-error-typo	Vipul A M	2016-04-07	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Typo:- Fix length validation error [ci skip]
\| * \| \| \| \|	fix length validation error typo	PareshGupta	2016-04-07	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #24422 from matthewd/extinguish-executor-exceptions	Matthew Draper	2016-04-07	5	-31/+200
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Clean up after a failure in a run callback
\| * \| \| \| \|	Directly support stateful executor hooks	Matthew Draper	2016-04-05	5	-31/+200
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also, make sure to call the +complete+ hooks if +run+ fails.
* \| \| \| \| \|	Merge pull request #24399 from jch/protect-against-db-schema-load-in-production	Richard Schneeman	2016-04-06	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent db:schema:load to protected environments
\| * \| \| \| \| \|	Prevent db:schema:load to protected environments	Jerry Cheung	2016-04-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow up to https://github.com/rails/rails/pull/22967 to protect against loading a schema on accident in production. cc @schneems
* \| \| \| \| \| \|	Merge pull request #24078 from kamipo/show_variables	Rafael França	2016-04-06	1	-2/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simply use `select_value` in `show_variable`
\| * \| \| \| \| \| \|	Simply use `select_value` in `show_variable`	Ryuta Kamizono	2016-03-06	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`SELECT @@name` statement returns only single row or `StatementInvalid`. ``` root@localhost [activerecord_unittest] > SELECT @@version; +-----------+ \| @@version \| +-----------+ \| 5.7.9-log \| +-----------+ 1 row in set (0.00 sec) root@localhost [activerecord_unittest] > SELECT @@unknown_variable; ERROR 1193 (HY000): Unknown system variable 'missing_variable' ```
* \| \| \| \| \| \| \|	Merge pull request #24374 from kamipo/move_quoting_methods_to_quoting_module	Rafael França	2016-04-06	4	-44/+38
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \|	Move quoting methods to `Quoting` module
\| * \| \| \| \| \| \|	Make `QUOTED_TRUE` and `QUOTED_FALSE` to public because these are used in ↵	Ryuta Kamizono	2016-04-06	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`MysqlString`
\| * \| \| \| \| \| \|	Move `quoted_date`, `quote_string` and `quote_table_name_for_assignment` ↵	Ryuta Kamizono	2016-04-05	4	-22/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	methods to `Quoting` module
\| * \| \| \| \| \| \|	Make to private `QUOTED_TRUE` and `QUOTED_FALSE` constants	Ryuta Kamizono	2016-04-05	2	-18/+18
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Cable typo: isSupportedProtocol -> isProtocolSupported	Jeremy Daer	2016-04-05	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Revert "Merge pull request #24440 from ↵	Rafael Mendonça França	2016-04-06	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	yahonda/use_newer_version_of_sqlite3_at_travis_ci" This reverts commit a3d085a4ce949526cd388d6b399347504d9a0c92, reversing changes made to e2df1c6d2aa1dd667c6c1be25d5c7f7d69f293fa. It broke the build
* \| \| \| \| \| \| \|	Merge pull request #24431 from vipulnsward/24119-followup	Rafael França	2016-04-06	1	-0/+8
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add test case for interpolation with passing of data along with record
\| * \| \| \| \| \| \| \|	Add test case for interpolation with passing of data along with record ↵	Vipul A M	2016-04-05	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	attribute in error message, where a proc is passed.
* \| \| \| \| \| \| \| \|	Merge pull request #24444 from ↵	Rafael França	2016-04-06	2	-4/+10
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	prathamesh-sonpatki/update-message-proc-documentation Update example of passing a proc to `:message` option for validating records [ci skip]
\| * \| \| \| \| \| \| \| \|	Update example of passing a proc to `:message` option for validating records ↵	Prathamesh Sonpatki	2016-04-06	2	-4/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] - This change is made as the behavior for `:message` proc was changed in https://github.com/rails/rails/pull/24119. - Also check https://github.com/rails/rails/pull/24431#issuecomment-206106790 for reference.
* \| \| \| \| \| \| \| \| \|	Fix Active Model basics introduction to indicate it only introduces us to ↵	Rafael França	2016-04-06	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	integration and not complete i18n framework. Fix Active Model basics introduction [ci skip]
\| * \| \| \| \| \| \| \| \|	Fix Active Model basics introduction to indicate it only introduces us to ↵	Vipul A M	2016-04-05	1	-1/+1
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	integration and not complete i18n framework. [ci skip]
* \| \| \| \| \| \| \| \|	Fix undefined method `owners' for NullPreloader:Class	Ladislav Smola	2016-04-06	6	-1/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fix undefined method `owners' for NullPreloader:Class Fixing undefined method `owners' for ActiveRecord::Associations::Preloader::NullPreloader:Class * Use Ruby 1.9 hash format Use Ruby 1.9 hash format #24192 [Rafael Mendonça França + Ladislav Smola]
* \| \| \| \| \| \| \| \|	Merge pull request #24436 from arktisklada/matching-sendmail-default-arguments	Rafael França	2016-04-06	3	-2/+8
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sendmail default arguments match Mail::SendMail
\| * \| \| \| \| \| \| \| \|	Sendmail default arguments match Mail::SendMail	arktisklada	2016-04-05	3	-2/+8
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes `-t`
* \| \| \| \| \| \| \| \|	Merge pull request #24440 from yahonda/use_newer_version_of_sqlite3_at_travis_ci	Rafael França	2016-04-06	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use SQLite3 3.7.15 which supports multiple values insert
\| * \| \| \| \| \| \| \| \|	Use SQLite3 3.7.15 which supports multiple values insert	Yasuo Honda	2016-04-05	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #24433 from kamipo/avoid_unused_capture	Rafael França	2016-04-05	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid unused capture
\| * \| \| \| \| \| \| \| \| \|	Avoid unused capture	Ryuta Kamizono	2016-04-05	1	-1/+1
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #24441 from harsimranmaan/patch-1	Rafael França	2016-04-05	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Remove hard-coded backticks in SQL statements
\| * \| \| \| \| \| \| \| \|	Remove hard-coded backticks in SQL statements	Harsimran Singh Maan	2016-04-05	1	-3/+3
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The hard-coded back-ticks made it hard to use a different char for quoting db fields. This checkin replaces it with quote_table_name.
* \| \| \| \| \| \| \| \|	Merge pull request #24224 from danielrhodes/actioncable-websocket-protocols	Jeremy Daer	2016-04-05	9	-24/+93
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActionCable protocol negotiation
\| * \| \| \| \| \| \| \| \|	Added protocol negotiation	Daniel Rhodes	2016-04-05	8	-24/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is primarily for backwards compatibility for when or if the protocol is changed in future versions. If the server fails to respond with an acceptable protocol, the client disconnects and disables the monitor.