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

	Commit message (Expand)	Author	Age	Files	Lines
*	Add info about updating locking column value	bogdanvlviv	2016-10-23	1	-0/+1
*	Revert "Made ActiveRecord consistently use ActiveRecord::Type (not"	Sean Griffin	2016-10-23	8	-23/+9
*	Update mysql2 version in Gemfile.lock	Guillermo Iguaran	2016-10-22	1	-4/+4
*	Update mysql adapter error message when disconnected	Guillermo Iguaran	2016-10-22	1	-2/+2
*	Merge pull request #26863 from claudiob/revert-26826	Rafael França	2016-10-22	1	-1/+6
\|\
\| *	Revert #26826 and add documentation	claudiob	2016-10-21	1	-1/+6
\|/
*	Merge pull request #26790 from iainbeeston/type-tests-in-their-own-files	Rafael França	2016-10-22	13	-168/+266
\|\
\| *	Refactored ActiveModel::Type tests into their own files	Iain Beeston	2016-10-15	13	-168/+266
* \|	Merge pull request #26810 from maclover7/jm-fix-26802	Rafael Mendonça França	2016-10-22	2	-0/+38
\|\ \
\| * \|	Convert ActionController::Parameters to a hash in button_to	Jon Moss	2016-10-17	2	-0/+22
* \| \|	Merge pull request #26416 from prathamesh-sonpatki/fix-select-example	Rafael França	2016-10-22	4	-7/+22
\|\ \ \
\| * \| \|	Fix regression caused due to removal of select method from CollectionAssociation	Prathamesh Sonpatki	2016-10-22	4	-7/+22
\|/ / /
* \| \|	Merge pull request #26843 from denisovlev/strptime_timestamps	Rafael França	2016-10-22	3	-11/+40
\|\ \ \
\| * \| \|	Fix `ActiveSupport::TimeZone#strptime` cannot parse timestamps (%Q, %s)	denisovlev	2016-10-21	3	-11/+40
* \| \| \|	Merge pull request #26826 from claudiob/add-require	Claudio B	2016-10-21	1	-0/+1
\|\ \ \ \
\| * \| \| \|	Add missing require	claudiob	2016-10-19	1	-0/+1
* \| \| \| \|	Merge pull request #26862 from headius/lazy_load_blade_for_tests	Guillermo Iguaran	2016-10-21	1	-1/+2
\|\ \ \ \ \
\| * \| \| \| \|	Lazy-load blade for actioncable tests; no blade on JRuby.	Charles Oliver Nutter	2016-10-21	1	-1/+2
* \| \| \| \| \|	Merge pull request #26860 from headius/soft_ordering_in_yaml_dump	Kasper Timm Hansen	2016-10-22	1	-6/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Soften this test since YAML.dump may produce keys in other orders.	Charles Oliver Nutter	2016-10-21	1	-6/+4
\| \|/ / / / /
* \| \| \| \| \|	Use `on_load` to trigger commandline processing code	Aaron Patterson	2016-10-21	3	-5/+10
* \| \| \| \| \|	Prevent the test framework from being loaded in production mode	Aaron Patterson	2016-10-21	3	-6/+14
* \| \| \| \| \|	Merge pull request #26859 from headius/mask_use_of_rubyvm_on_jruby	Aaron Patterson	2016-10-21	1	-0/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Skip test that depends on RubyVM when it is not available (JRuby).	Charles Oliver Nutter	2016-10-21	1	-0/+2
\|/ / / / /
* \| \| \| \|	Revert "Undefine assings in IntegrationTest"	Rafael Mendonça França	2016-10-21	2	-10/+0
* \| \| \| \|	Merge pull request #26819 from lastgabs/add-examples-active-job-test-helper	Rafael França	2016-10-21	1	-0/+24
\|\ \ \ \ \
\| * \| \| \| \|	Add examples of queue_adapter and perform_enqueued jobs to API Docs.	Gabi Stefanini	2016-10-21	1	-0/+24
* \| \| \| \| \|	Merge pull request #26050 from bogdanvlviv/optimistic_locking	Aaron Patterson	2016-10-21	5	-20/+157
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Added ability update locking_column value	bogdanvlviv	2016-10-21	4	-7/+90
\| * \| \| \| \|	Fixed: Optimistic locking does not work well with null in the database	bogdanvlviv	2016-10-21	4	-15/+69
\|/ / / / /
* \| \| \| \|	Merge pull request #26855 from headius/explicit_order_callback_args	Aaron Patterson	2016-10-21	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Additional fix for argument-splat ordering differences.	Charles Oliver Nutter	2016-10-21	1	-2/+2
* \| \| \| \| \|	Merge pull request #26854 from headius/explicit_order_callback_args	Aaron Patterson	2016-10-21	1	-4/+4
\|\\| \| \| \| \|
\| * \| \| \| \|	Explicitly unpack the expanded args to avoid execution order diff.	Charles Oliver Nutter	2016-10-21	1	-4/+4
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #26853 from zegomesjf/feature/skip_active_record	Guillermo Iguaran	2016-10-21	2	-0/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	don't create db directory when skip active_record	José Gomes Júnior	2016-10-21	2	-0/+2
\|/ / / /
* \| \| \|	Merge pull request #26839 from renuo/fix-missing-nsec-transfer	Andrew White	2016-10-21	3	-2/+10
\|\ \ \ \
\| * \| \| \|	Fix copy_time_to: Copy nsec instead of usec	Josua Schmid	2016-10-20	3	-2/+10
\| \|/ / /
* \| \| \|	doc, hide non-public methods form the api docs. [ci skip]	Yves Senn	2016-10-20	1	-2/+2
* \| \| \|	guides, include note about modifiers when using the CLI.	Yves Senn	2016-10-20	1	-0/+2
* \| \| \|	remove trailing whitespace [ci skip]	Yves Senn	2016-10-20	1	-8/+8
* \| \| \|	Merge pull request #26846 from brunofacca/patch-1	Rafael França	2016-10-20	1	-4/+4
\|\ \ \ \
\| * \| \| \|	[ci skip] Fix return values of Hash Extensions examples	Bruno Facca	2016-10-20	1	-4/+4
\|/ / / /
* \| \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2016-10-20	2	-4/+4
\|\ \ \ \
\| * \| \| \|	Corrected comments referring to documentation in	Iain Beeston	2016-10-03	1	-3/+3
\| * \| \| \|	Corrected comments referring to ActiveModel::Attributes	Iain Beeston	2016-10-03	1	-1/+1
* \| \| \| \|	Use old typecasting method if no type casted binds are passed in	Aaron Patterson	2016-10-20	2	-2/+45
* \| \| \| \|	Merge pull request #26830 from headius/mask_forking_fsevent_test_on_jruby	Rafael Mendonça França	2016-10-20	1	-0/+2
* \| \| \| \|	render_bind should be private	Aaron Patterson	2016-10-19	1	-10/+10
* \| \| \| \|	Merge pull request #26829 from headius/wait_for_events_in_listen_tests	Aaron Patterson	2016-10-19	1	-0/+18