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

	Commit message (Expand)	Author	Age	Files	Lines
*	Fix typo in `AC::UnfilteredParameters` message [ci skip]	yuuji.yaginuma	2017-06-23	1	-2/+2
*	Merge pull request #29524 from y-yagi/do_not_use_private_api_in_bug_report_te...	Eileen M. Uchitelle	2017-06-22	2	-8/+4
\|\
\| *	Do not use private API in bug report templates	yuuji.yaginuma	2017-06-22	2	-8/+4
* \|	Merge pull request #29529 from abraham-chan/fix-hash-conditions-documentation	Ryuta Kamizono	2017-06-22	1	-2/+0
\|\ \
\| * \|	Fix hash conditions documentation [ci skip]	Abraham Chan	2017-06-22	1	-2/+0
* \| \|	Merge pull request #29525 from y-yagi/fix_ruby_warnings	Kasper Timm Hansen	2017-06-22	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Remove unused variable	yuuji.yaginuma	2017-06-22	1	-1/+1
\|/ /
* \|	Merge pull request #29513 from kirs/fixture-yaml-fallback	Rafael França	2017-06-21	1	-5/+4
\|\ \
\| * \|	Avoid begin/rescue in fixture quoting	Kir Shatrov	2017-06-20	1	-5/+4
* \| \|	Merge pull request #27063 from MaxLap/merge_keep_inner_join	Rafael França	2017-06-21	3	-5/+40
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Keep INNER JOIN when merging relations	Maxime Lapointe	2017-06-20	3	-5/+40
* \| \|	Fix call-seq typo s/==/<=>/ [ci skip]	Ryuta Kamizono	2017-06-21	1	-1/+1
\|/ /
* \|	Merge pull request #28914 from bogdanvlviv/fix-touch-with-optimistic-locking	Rafael França	2017-06-20	4	-3/+33
\|\ \
\| * \|	Fix ActiveRecord::Persistence#touch with locking	bogdanvlviv	2017-06-21	4	-3/+33
\|/ /
* \|	Merge pull request #28926 from bogdanvlviv/fix-destroy-with-locking_column-va...	Rafael França	2017-06-20	3	-1/+31
\|\ \
\| * \|	Fix destroy with locking_column value null	bogdanvlviv	2017-06-20	3	-1/+31
\|/ /
* \|	Merge pull request #29510 from padi/minor_docs_update	Rafael França	2017-06-20	2	-1/+3
\|\ \
\| * \|	Adds missing minor doc about tools/test.rb [ci skip]	Marc Ignacio	2017-06-21	2	-1/+3
* \| \|	Merge pull request #29504 from kirs/fixtures-arel-bulk	Rafael França	2017-06-20	9	-11/+117
\|\ \ \
\| * \| \|	Use bulk INSERT to insert fixtures	Kir Shatrov	2017-06-20	9	-11/+117
* \| \| \|	Shrink image files in the guides using ImageOptim	Akira Matsuda	2017-06-21	39	-0/+0
\| \|/ / \|/\| \|
* \| \|	Merge pull request #29503 from savroff/fix_current_page_engine_issue	Rafael França	2017-06-20	3	-4/+23
\|\ \ \
\| * \| \|	Add changes to CHANGELOG	savroff	2017-06-19	1	-0/+6
\| * \| \|	Fix current_page? helper issue with engine root path	savroff	2017-06-19	2	-4/+17
* \| \| \|	Merge pull request #28833 from bogdanvlviv/add-test-cases-for-optimistic-locking	Rafael França	2017-06-20	2	-3/+23
\|\ \ \ \
\| * \| \| \|	Clean up 'Optimistic Locking' implementation	bogdanvlviv	2017-06-12	1	-3/+4
\| * \| \| \|	Add test cases for optimistic locking	bogdanvlviv	2017-06-12	1	-0/+19
* \| \| \| \|	[ci skip] Fixed the attribute name for event.detail	Prathamesh Sonpatki	2017-06-20	1	-3/+3
* \| \| \| \|	Merge pull request #29505 from utilum/assert_nil	Rafael França	2017-06-20	2	-2/+2
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	prepare for Minitest 6	utilum	2017-06-20	2	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #27990 from leonelgalan/bug/filtered_parameters_class	Rafael França	2017-06-19	3	-2/+15
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Merge branch 'master' into bug/filtered_parameters_class	Leonel Galán	2017-06-16	462	-3743/+5112
\| \|\ \ \
\| * \ \ \	Merge branch 'master' into bug/filtered_parameters_class	Leonel Galán	2017-05-17	174	-874/+1495
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'master' into bug/filtered_parameters_class	Leonel Galán	2017-04-25	182	-823/+2143
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'master' into bug/filtered_parameters_class	Leonel Galán	2017-04-03	498	-5491/+9151
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Fixes CodeClimate warnings	Leonel Galan	2017-02-13	1	-2/+2
\| * \| \| \| \| \| \|	Use of ParameterFilter no longer forces `request.filtered_parameters' class t...	Leonel Galan	2017-02-13	3	-2/+15
* \| \| \| \| \| \| \|	Merge pull request #29485 from tjschuck/nodoc_ac_conn_websocket	Rafael França	2017-06-19	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	nodoc AC::Connection::WebSocket	T.J. Schuck	2017-06-16	1	-1/+1
* \| \| \| \| \| \| \| \|	Merge pull request #29454 from kamipo/fix_exists_queries_with_cache	Rafael França	2017-06-19	3	-51/+46
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Ensure query caching for `select_*` methods in connection adapters	Ryuta Kamizono	2017-06-15	4	-52/+41
\| * \| \| \| \| \| \| \| \|	Fix `Relation#exists?` queries with query cache	Ryuta Kamizono	2017-06-15	2	-1/+7
* \| \| \| \| \| \| \| \| \|	Merge pull request #29494 from kamipo/prevent_extra_scope_construction	Rafael França	2017-06-19	3	-3/+5
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Prevent extra `scope` construction in `find_target`	Ryuta Kamizono	2017-06-18	3	-3/+5
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #29486 from kirs/fixtures-arel	Rafael França	2017-06-19	1	-4/+11
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Refactor #insert_fixtures to use Arel	Kir Shatrov	2017-06-19	1	-4/+11
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #29493 from y-yagi/deprecate_capify	Rafael França	2017-06-19	4	-10/+10
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Deprecate an `capify!` method in generators and templates	yuuji.yaginuma	2017-06-18	4	-10/+10
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #29499 from koic/ci_against_jruby_9_1_12_0	Rafael França	2017-06-19	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	CI against JRuby 9.1.12.0	Koichi ITO	2017-06-19	1	-3/+3
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \|