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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #29027 from mohitnatoo/foreign-key-name	Matthew Draper	2017-05-24	1	-2/+3
\|\
\| *	[Foreign Key] Don't worry about the building identifier if name is already pr...	Mohit Natoo	2017-05-10	1	-2/+3
* \|	Merge pull request #29167 from koic/remove_duplicate_inverse_associations_test	Matthew Draper	2017-05-24	1	-14/+0
\|\ \
\| * \|	Remove a duplicate test of inverse_associations_test in AR	Koichi ITO	2017-05-21	1	-14/+0
* \| \|	Merge pull request #29174 from kamipo/remove_unused_join_part_name	Matthew Draper	2017-05-24	1	-4/+0
\|\ \ \
\| * \| \|	Remove unused `JoinPart#name`	Ryuta Kamizono	2017-05-22	1	-4/+0
* \| \| \|	Merge pull request #29179 from y-yagi/remove_rubygems_version_lock	Matthew Draper	2017-05-24	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Remove rubygems version lock	yuuji.yaginuma	2017-05-22	1	-1/+1
* \| \| \| \|	Merge pull request #29182 from kamipo/remove_unused_left_joins_values_generation	Matthew Draper	2017-05-24	2	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Remove unused `left_joins_values` generation	Ryuta Kamizono	2017-05-23	2	-2/+2
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #29183 from kamipo/refactor_making_join_constraints	Matthew Draper	2017-05-24	1	-23/+6
\|\ \ \ \ \
\| * \| \| \| \|	Refactor making join constraints	Ryuta Kamizono	2017-05-23	1	-23/+6
* \| \| \| \| \|	Merge pull request #29184 from kirs/nested-attributes-friendly-error	Matthew Draper	2017-05-24	2	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	More friendly exception in nested attributes	Kir Shatrov	2017-05-22	2	-2/+2
\| \|/ / / / /
* / / / / /	Remove unused simulate method	eileencodes	2017-05-22	2	-21/+21
\|/ / / / /
* \| \| \| \|	Merge pull request #29178 from simi/patch-1	प्रथमेश Sonpatki	2017-05-22	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Update test link in ActionView javascripts README.md.	Josef Šimánek	2017-05-22	1	-1/+1
\|/ / / /
* / / /	We always + 1 to __LINE__ when class_evaling with <<	Akira Matsuda	2017-05-22	1	-1/+1
\|/ / /
* \| \|	Merge pull request #29173 from ffmike/simplify-getting-started	Robin Dupret	2017-05-21	1	-12/+13
\|\ \ \
\| * \| \|	Simplify handling of prerequisites in Getting Started guide [ci skip]	Mike Gunderloy	2017-05-21	1	-12/+13
* \| \| \|	Merge pull request #29072 from dixpac/dixpac/add_documentation_for_validate_a...	Robin Dupret	2017-05-21	5	-1/+32
\|\ \ \ \
\| * \| \| \|	Improving docs for callbacks execution order [ci skip]	dixpac	2017-05-21	5	-1/+32
* \| \| \| \|	Merge pull request #29163 from rails/fix-scalar-duration-calculation	Andrew White	2017-05-21	3	-6/+91
\|\ \ \ \ \
\| * \| \| \| \|	Fix implicit calculations with scalars and durations	Andrew White	2017-05-20	3	-6/+91
* \| \| \| \| \|	Merge pull request #29170 from ffmike/remove-obsolete-guides	Kasper Timm Hansen	2017-05-21	2	-246/+0
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	Remove obsolete Guides source files [ci skip]	Mike Gunderloy	2017-05-21	2	-246/+0
* \| \| \| \| \|	Merge pull request #29168 from ffmike/fix-broken-links-guides	प्रथमेश Sonpatki	2017-05-21	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Fix broken external link in security guide.	Mike Gunderloy	2017-05-21	1	-1/+1
\|/ / / / /
* \| \| \| \|	bundle up sidekiq to the one with safer integration with Rails 5	Akira Matsuda	2017-05-21	1	-3/+3
* \| \| \| \|	Merge pull request #29166 from kevinhyunilkim/fix_typo_in_guide	Ryuta Kamizono	2017-05-21	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Fix typo in guides	Kevin Kim	2017-05-21	1	-1/+1
\|/ / / /
* \| \| \|	identifiers is already defined via Connection::Identification module	Akira Matsuda	2017-05-21	1	-1/+1
* \| \| \|	bundle up redis to the one that does not warn about ::Fixnum deprecation	Akira Matsuda	2017-05-21	1	-2/+2
* \| \| \|	Merge pull request #29156 from kamipo/make_valid_directions_to_set	Andrew White	2017-05-20	1	-3/+5
\|\ \ \ \
\| * \| \| \|	Make `VALID_DIRECTIONS` to `Set`	Ryuta Kamizono	2017-05-20	1	-3/+5
* \| \| \| \|	Merge pull request #29162 from ffmike/update-rack-guide	Vijay Dev	2017-05-20	1	-6/+11
\|\ \ \ \ \
\| * \| \| \| \|	Update 'Rails on Rack' guide [ci skip]	Mike Gunderloy	2017-05-20	1	-6/+11
\|/ / / / /
* \| / / /	Remove unused mismatch payload attribute	David Heinemeier Hansson	2017-05-20	1	-5/+1
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #29158 from ffmike/add-json-feed	Andrew White	2017-05-20	5	-7/+14
\|\ \ \ \
\| * \| \| \|	Add :json type to auto_discovery_link_tag	Mike Gunderloy	2017-05-20	5	-7/+14
* \| \| \| \|	Unused variable	David Heinemeier Hansson	2017-05-20	1	-1/+0
\|/ / / /
* \| \| \|	Merge pull request #29153 from kamipo/fix_warning_assigned_but_unused_variable	Kasper Timm Hansen	2017-05-20	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix `warning: assigned but unused variable - timestamp`	Ryuta Kamizono	2017-05-20	1	-1/+1
\|/ / /
* \| \|	Merge pull request #29134 from joshaidan/document-action-name	Alex Kitchens	2017-05-19	1	-0/+8
\|\ \ \
\| * \| \|	Clarified description of formats [ci skip]	Brian Jones	2017-05-19	1	-1/+1
\| * \| \|	Added missing punctuation [ci skip]	Brian Jones	2017-05-18	1	-3/+3
\| * \| \|	Specify only the body of the response is returned [ci skip]	Brian Jones	2017-05-18	1	-1/+1
\| * \| \|	Document accessors response_body, action_name, formats [ci skip]	Brian Jones	2017-05-17	1	-0/+8
* \| \| \|	Merge pull request #29057 from koic/suppress_warning_assigned_but_unused_vari...	Akira Matsuda	2017-05-19	2	-2/+2
\|\ \ \ \
\| * \| \| \|	Suppress `warning: assigned but unused variable - stdout`	Koichi ITO	2017-05-12	2	-2/+2
\| \| \|_\|/ \| \|/\| \|