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

	Commit message (Expand)	Author	Age	Files	Lines
*	Update security.md	Yauheni Dakuka	2017-06-26	1	-1/+1
*	Merge pull request #29576 from ttanimichi/add-railtie-rb	Rafael França	2017-06-26	5	-2/+20
\|\
\| *	Add `railtie.rb` to the plugin generator	Tsukuru Tanimichi	2017-06-26	5	-2/+20
* \|	Merge pull request #29511 from jhawthorn/clear_offsets_cache_on_collection_proxy	Rafael França	2017-06-26	2	-0/+36
\|\ \
\| * \|	Move clearing of @offsets cache to reset_scope	John Hawthorn	2017-06-21	2	-14/+22
\| * \|	Clear offset cache on CollectionProxy reset/reload	John Hawthorn	2017-06-20	2	-0/+28
* \| \|	Merge pull request #29519 from Edouard-chin/ec-structure-flags-order	Rafael França	2017-06-26	2	-4/+4
\|\ \ \
\| * \| \|	PR Review	Edouard CHIN	2017-06-21	1	-2/+2
\| * \| \|	pass `structure_dump_flags` / `structure_load_flags` options before any other:	Edouard CHIN	2017-06-21	2	-4/+4
* \| \| \|	Merge pull request #29579 from y-yagi/remove_needless_gitignore	Guillermo Iguaran	2017-06-26	1	-1/+0
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Remove needless gitignore	yuuji.yaginuma	2017-06-26	1	-1/+0
\|/ / /
* \| \|	Merge pull request #29561 from samphippen/samphippen/add-option-to-silence-pu...	Sean Griffin	2017-06-24	1	-1/+12
\|\ \ \
\| * \| \|	Add an option to silence puma in system tests.	Sam Phippen	2017-06-24	1	-1/+12
\|/ / /
* \| \|	Merge pull request #29553 from eugeneius/wrap_parameters_nil	Kasper Timm Hansen	2017-06-24	2	-1/+9
\|\ \ \
\| * \| \|	Don't wrap parameters if key already exists	Eugene Kenny	2017-06-24	2	-1/+9
* \| \| \|	Merge pull request #29549 from Edouard-chin/integration-testing-deprecated-me...	Kasper Timm Hansen	2017-06-24	1	-2/+1
\|\ \ \ \
\| * \| \| \|	Removed reference to unexisting methods:	Edouard CHIN	2017-06-23	1	-2/+1
\| \|/ / /
* \| \| \|	Merge pull request #29555 from ybakos/guides_layouts_and_rendering_minus_lead...	Ryuta Kamizono	2017-06-24	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Guides: Clarify partial local variable naming.	Yong Bakos	2017-06-23	1	-1/+1
\|/ / /
* \| \|	Merge pull request #29544 from y-yagi/fix_ac_unfiltered_parameters_msg	Ryuta Kamizono	2017-06-23	1	-2/+2
\|\ \ \
\| * \| \|	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
\|/ / / / /