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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #30509 from y-yagi/remove_outdated_comment	Ryuta Kamizono	2017-09-02	1	-1/+1
\|\
\| *	Fix outdated comment [ci skip]	yuuji.yaginuma	2017-09-02	1	-1/+1
* \|	Retry if rubygems misbehaves: it's probably just the network	Matthew Draper	2017-09-02	1	-2/+2
* \|	Fix preloading through association with custom scope	Ryuta Kamizono	2017-09-02	2	-1/+11
* \|	Merge pull request #30493 from koic/fix_cant_modify_frozen_string_error_in_ac...	Ryuta Kamizono	2017-09-02	2	-1/+13
\|\ \
\| * \|	Fix `can't modify frozen String` error in AC::Rendering	Koichi ITO	2017-09-02	2	-1/+13
* \| \|	Merge pull request #30506 from yhirano55/replace_unnecessary_links_with_tt_text	Ryuta Kamizono	2017-09-02	1	-2/+2
\|\ \ \
\| * \| \|	Replace unnecessary link with typewriter text [ci skip]	Yoshiyuki Hirano	2017-09-02	1	-2/+2
* \| \| \|	Accept GCS client options	George Claghorn	2017-09-01	1	-2/+2
\|/ / /
* \| \|	Add a test case for preloading through association with implicit source	Ryuta Kamizono	2017-09-02	1	-0/+8
* \| \|	`values[:includes]` in `reflection_scope` is not compatible with `through_scope`	Ryuta Kamizono	2017-09-02	2	-2/+7
* \| \|	Don't call `scope.eager_loading?` when `reflection_scope.where_clause` is empty	Ryuta Kamizono	2017-09-02	1	-10/+10
* \| \|	Merge pull request #30503 from yahonda/bump_postgresql_and_ruby_versions	Ryuta Kamizono	2017-09-02	1	-1/+1
\|\ \ \
\| * \| \|	Bump PostgreSQL version to the latest version 9.6 at Travis CI	Yasuo Honda	2017-09-01	1	-1/+1
\|/ / /
* \| \|	Merge pull request #30499 from yahonda/diag_float	Ryuta Kamizono	2017-09-02	2	-9/+4
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	sqlite3 adapter returns integer value which used to be string	Yasuo Honda	2017-09-01	2	-9/+4
\|/ /
* \|	Merge pull request #29850 from yahonda/test_with_mariadb_102_on_trusty	Ryuta Kamizono	2017-09-01	2	-1/+5
\|\ \
\| * \|	Skip `test_remove_column_with_multi_column_index`	Yasuo Honda	2017-09-01	1	-0/+4
\| * \|	CI with the latest stable(GA) version of MariaDB 10.2	Yasuo Honda	2017-09-01	1	-1/+1
* \| \|	`add_reference` should respect column position for both reference id and type...	Ryuta Kamizono	2017-09-01	2	-1/+11
\|/ /
* \|	Remove unused require	Ryuta Kamizono	2017-09-01	1	-2/+0
* \|	:warning: assigned but unused variable - message	Akira Matsuda	2017-09-01	1	-6/+6
* \|	Unused variables	Akira Matsuda	2017-09-01	1	-2/+2
* \|	Hash#transform_keys is in Ruby 2.5+	Akira Matsuda	2017-09-01	1	-2/+2
* \|	Suppress "unused variable" in Ruby 2.5	Akira Matsuda & yui-knk	2017-09-01	1	-3/+4
* \|	double assign is no longer an effective workaround for unused variable warning	Akira Matsuda	2017-09-01	1	-1/+1
* \|	Merge pull request #30492 from y-yagi/remove_neeless_silence_warnings	Ryuta Kamizono	2017-09-01	1	-4/+1
\|\ \
\| * \|	Remove needless `silence_warnings`	yuuji.yaginuma	2017-09-01	1	-4/+1
* \| \|	Merge pull request #29233 from matthewd/redefine-method	Matthew Draper	2017-09-01	18	-67/+98
\|\ \ \
\| * \| \|	Self-alias doesn't suppress the warning on Ruby 2.2	Matthew Draper	2017-09-01	1	-8/+17
\| * \| \|	Clarify intentions around method redefinitions	Matthew Draper	2017-09-01	18	-67/+89
\|/ / /
* \| \|	Have attachments touch their records	George Claghorn	2017-08-31	1	-1/+1
* \| \|	Merge pull request #30490 from y-yagi/fix_cant_modify_forzen_string_error_in_...	Richard Schneeman	2017-08-31	1	-1/+1
\|\ \ \
\| * \| \|	Fix `can't modify frozen String` error in `XmlMini_JDOM`	yuuji.yaginuma	2017-09-01	1	-1/+1
\| \|/ /
* \| \|	Merge pull request #30486 from rosa/ignore-deleted-gcs-files-on-deletion	George Claghorn	2017-08-31	1	-1/+5
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Ignore files already deleted on GCS file deletions	Rosa Gutierrez	2017-08-31	1	-1/+5
\|/ /
* \|	Merge pull request #30481 from Persola/master	Ryuta Kamizono	2017-08-31	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	In Action View Overview guide, remove reference to custom helpers	Luke Persola	2017-08-30	1	-1/+1
* \|	Merge pull request #30323 from yhirano55/support_multiple_version_for_gem_method	Matthew Draper	2017-08-31	3	-9/+25
\|\ \
\| * \|	Support multiple versions arguments for `gem` method of Generators	Yoshiyuki Hirano	2017-08-19	3	-9/+25
* \| \|	Merge pull request #30377 from keepcosmos/delegate-missing-methods	Matthew Draper	2017-08-31	2	-4/+4
\|\ \ \
\| * \| \|	Delegate :rindex, :slice, :rotate to 'records'	keepcosmos	2017-08-24	2	-4/+4
* \| \| \|	Merge pull request #30392 from koic/unify_source_control_keep_file_name	Matthew Draper	2017-08-31	2	-0/+0
\|\ \ \ \
\| * \| \| \|	Unify the internal source control .keep file name	Koichi ITO	2017-08-24	2	-0/+0
* \| \| \| \|	Merge pull request #30425 from wassimk/WAM-update-rubocop-to-latest-in-code-c...	Matthew Draper	2017-08-31	1	-0/+1
\|\ \ \ \ \
\| * \| \| \| \|	Run latest Rubocop in CodeClimate	Wassim Metallaoui	2017-08-26	1	-0/+1
* \| \| \| \| \|	Merge pull request #30477 from yhirano55/update_rdoc_main	Matthew Draper	2017-08-31	1	-42/+60
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
\| * \| \| \| \|	Update RDOC_MAIN.rdoc [ci skip]	Yoshiyuki Hirano	2017-08-31	1	-42/+60
* \| \| \| \| \|	Merge pull request #29964 from gwincr11/cg-partial-caching	Eileen M. Uchitelle	2017-08-30	1	-0/+18
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add documentation about template partial caching	Cory Gwin @gwincr11	2017-08-30	1	-3/+21