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

	Commit message (Expand)	Author	Age	Files	Lines
*	Remove leftover blank sqlite3 file after in memory handler tests.	utilum	2018-04-01	1	-0/+2
*	Merge pull request #32398 from bogdanvlviv/32185-dry-in-before-after-mehtods-...	Ryuta Kamizono	2018-04-01	8	-42/+22
\|\
\| *	Move implementation of `before?` and `after?` to `DateAndTime::Calculations`	bogdanvlviv	2018-03-31	8	-42/+22
* \|	Merge pull request #32396 from eugeneius/database_configurations_url	Eileen M. Uchitelle	2018-03-31	2	-11/+53
\|\ \
\| * \|	Fix two-level database configurations with URLs	Eugene Kenny	2018-03-31	2	-11/+53
* \| \|	Merge pull request #32397 from yhirano55/remove_needless_images_in_guides	Xavier Noria	2018-03-31	41	-15/+10
\|\ \ \
\| * \| \|	Remove needless images in guides	Yoshiyuki Hirano	2018-03-31	28	-5/+0
\| * \| \|	Put images into each page's dir in guides	Yoshiyuki Hirano	2018-03-31	13	-10/+10
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #32394 from yskkin/key_generator	Andrew White	2018-03-31	2	-1/+2
\|\ \ \
\| * \| \|	Deriving `secret_key_base` breaks `key_generator` defined in 5.1.	Yoshiyuki Kinjo	2018-03-31	2	-1/+2
* \| \| \|	Merge pull request #32395 from yhirano55/use_oxford_comma_style_in_guide	Andrew White	2018-03-31	1	-1/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	[ci skip] Use Oxford comma style in guide	Yoshiyuki Hirano	2018-03-31	1	-1/+1
* \| \| \|	Merge pull request #32386 from utilum/tmpname_basename	Andrew White	2018-03-31	1	-1/+3
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Fix: FileStoreTest#test_filename_max_size fails in Ruby 2.5.1	utilum	2018-03-31	1	-1/+3
\|/ / /
* / /	Revert "[ci skip] Capitalize sentence of first char in AS guide"	Andrew White	2018-03-31	1	-1/+1
\|/ /
* \|	Merge pull request #32392 from yhirano55/capitalize_sentence_of_first_char_in...	Andrew White	2018-03-31	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	[ci skip] Capitalize sentence of first char in AS guide	Yoshiyuki Hirano	2018-03-31	1	-1/+1
* \|	Merge pull request #32389 from yhirano55/add_earlier_releases_in_guides	Ryuta Kamizono	2018-03-31	1	-1/+3
\|\ \
\| * \|	Add earlier releases links v3.0 and v3.1 in guides	Yoshiyuki Hirano	2018-03-31	1	-1/+3
* \| \|	Merge pull request #32388 from yhirano55/remove_useless_stylesheet_file_in_guide	Ryuta Kamizono	2018-03-31	1	-50/+0
\|\ \ \
\| * \| \|	Remove useless stylesheet file in guide	Yoshiyuki Hirano	2018-03-31	1	-50/+0
\| \|/ /
* \| \|	Bump tested versions of Ruby on CI	Andrew White	2018-03-31	1	-8/+8
* \| \|	Merge pull request #32390 from yhirano55/modify_twitter_api_link_in_api_guide	Ryuta Kamizono	2018-03-31	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	[ci skip] Modify twitter api link in api guide	Yoshiyuki Hirano	2018-03-31	1	-1/+1
\|/ /
* \|	Merge pull request #32366 from utilum/use_current_config	Andrew White	2018-03-30	1	-1/+1
\|\ \
\| * \|	Use current_config in structure_dump	utilum	2018-03-29	1	-1/+1
* \| \|	Merge pull request #32277 from derekprior/dp-deprecate-force-ssl	Guillermo Iguaran	2018-03-30	7	-90/+62
\|\ \ \
\| * \| \|	Deprecate controller level force_ssl	Derek Prior	2018-03-30	7	-90/+62
* \| \| \|	Merge pull request #32384 from riseshia/remove-expired-document	Andrew White	2018-03-30	1	-15/+1
\|\ \ \ \
\| * \| \| \|	Remove expired explanation [ci skip]	Shia	2018-03-30	1	-15/+1
* \| \| \| \|	Remove shadowing variable warning	Andrew White	2018-03-30	1	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #32383 from freeletics/add-missing-require	Ryuta Kamizono	2018-03-30	1	-0/+1
\|\ \ \ \
\| * \| \| \|	Adding missing extension for `cattr_accessor` method	Wojciech Wnętrzak	2018-03-30	1	-0/+1
\|/ / / /
* \| \| \|	Fix intermittent CI failure due to setting explicit `person.id = 10`	Ryuta Kamizono	2018-03-30	1	-4/+0
* \| \| \|	Merge pull request #32338 from eugeneius/dont_clobber_foreign_key	Ryuta Kamizono	2018-03-30	2	-2/+4
\|\ \ \ \
\| * \| \| \|	Don't unset foreign key when preloading missing record	Eugene Kenny	2018-03-24	2	-2/+4
* \| \| \| \|	Short circuit the scoping delegation for `relation.all`	Ryuta Kamizono	2018-03-30	1	-0/+1
* \| \| \| \|	Remove unnecessary line break and quotes	yuuji.yaginuma	2018-03-30	1	-2/+2
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Fix "--frozen-lockfile" argument used in yarn install rake task	Guillermo Iguaran	2018-03-29	1	-1/+1
* \| \| \|	Merge pull request #32289 from gsamokovarov/did-you-mean-suggestions	Guillermo Iguaran	2018-03-29	6	-57/+14
\|\ \ \ \
\| * \| \| \|	Use `did_you_mean` spell checker for option suggestions	Genadi Samokovarov	2018-03-23	6	-57/+14
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #32243 from maschwenk/patch-2	Guillermo Iguaran	2018-03-29	1	-1/+1
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Raise an error when lockfile diff is generated	Max Schwenk	2018-03-13	1	-1/+1
* \| \| \|	Merge pull request #32370 from riseshia/patch-1	Andrew White	2018-03-29	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Compare ruby version with correct way	Shia	2018-03-29	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #30956 from CJStadler/with-lock-changed-deprecation	Rafael França	2018-03-28	4	-1/+24
* \| \| \|	Bump rack-test to 1.0.0	Yuji Yaginuma	2018-03-28	1	-1/+1
* \| \| \|	Merge pull request #32299 from davidstosik/expose-fk-ignore-pattern	Guillermo Iguaran	2018-03-27	7	-3/+43
\|\ \ \ \
\| * \| \| \|	Move fk_ignore_pattern from config.active_record to SchemaDumper	David Stosik	2018-03-22	6	-16/+18
\| * \| \| \|	Test config.active_record.fk_ignore_pattern	David Stosik	2018-03-20	1	-0/+8