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

	Commit message (Expand)	Author	Age	Files	Lines
*	Replace Erubis with Erubi in a part of guide [ci skip]	Koichi ITO	2017-07-16	1	-1/+1
*	Merge pull request #29771 from kamipo/fix_create_with_using_both_string_and_s...	Kasper Timm Hansen	2017-07-16	9	-22/+24
\|\
\| *	Fix `create_with` using both string and symbol	Ryuta Kamizono	2017-07-16	9	-18/+20
\| *	Use `where(id: 10)` rather than `where(relation.table[:id].eq(10))`	Ryuta Kamizono	2017-07-16	1	-5/+5
\|/
*	Merge pull request #29645 from y-yagi/check_component_when_run_app_update	Kasper Timm Hansen	2017-07-16	5	-23/+60
\|\
\| *	Do not generate unused components contents in `app:update` task	yuuji.yaginuma	2017-07-16	5	-23/+60
* \|	Merge pull request #29806 from yhirano55/remove_blank_line_in_setup	Kasper Timm Hansen	2017-07-16	1	-2/+3
\|\ \ \| \|/ \|/\|
\| *	Remove blank lines in setup	Yoshiyuki Hirano	2017-07-16	1	-2/+3
* \|	Merge pull request #29679 from kamipo/add_test_case_for_27724	Kasper Timm Hansen	2017-07-15	2	-0/+12
\|\ \
\| * \|	Add a test case for overwriting existing condition on associations	Ryuta Kamizono	2017-07-07	2	-0/+12
* \| \|	Merge pull request #29769 from kamipo/remove_extra_order_for_first	Kasper Timm Hansen	2017-07-15	2	-32/+28
\|\ \ \
\| * \| \|	Remove extra `.merge!(order: "id")` for `Relation#first` in tests	Ryuta Kamizono	2017-07-13	2	-32/+28
* \| \| \|	Merge pull request #29770 from y-yagi/fix_boolean_column_migration_script	Kasper Timm Hansen	2017-07-15	3	-3/+3
\|\ \ \ \
\| * \| \| \|	Fix boolean column migration script	yuuji.yaginuma	2017-07-13	3	-3/+3
* \| \| \| \|	Merge pull request #29802 from EmmaB/master	Kasper Timm Hansen	2017-07-15	1	-4/+4
\|\ \ \ \ \
\| * \| \| \| \|	Remove redundant instances of the word 'simply' from documentation, on the ba...	Emma Barnes	2017-07-15	1	-4/+4
\|/ / / / /
* \| \| \| \|	Merge pull request #29798 from kamipo/remove_useless_aliased_table_name	Kasper Timm Hansen	2017-07-15	4	-18/+1
\|\ \ \ \ \
\| * \| \| \| \|	Remove useless `aliased_table_name` in `JoinDependency`	Ryuta Kamizono	2017-07-15	4	-18/+1
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge pull request #29800 from koic/remove_encoding_utf8_magic_comment	Kasper Timm Hansen	2017-07-15	2	-2/+0
\|\ \ \ \ \
\| * \| \| \| \|	Remove encoding utf-8 magic comment	Koichi ITO	2017-07-15	2	-2/+0
\|/ / / / /
* \| \| \| \|	Merge pull request #29797 from y-yagi/fix_doc_format_for_time_helpers	Ryuta Kamizono	2017-07-15	1	-2/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Fix doc format for `ActiveSupport::Testing::TimeHelpers` [ci skip]	yuuji.yaginuma	2017-07-15	1	-2/+2
\| \|/ / /
* \| \| \|	Merge pull request #29786 from willnet/remove-javascript_link_tag-options	Ryuta Kamizono	2017-07-14	1	-32/+0
\|\ \ \ \
\| * \| \| \|	[ci skip]Remove options of javascript_link_tag and stylesheet_link_tag in guides	willnet	2017-07-14	1	-32/+0
\|/ / / /
* \| \| \|	Merge pull request #29772 from y-yagi/allow_to_edit_secrets_in_mutiple_applic...	Kasper Timm Hansen	2017-07-13	1	-1/+2
\|\ \ \ \
\| * \| \| \|	Allow to edit secrets in mutiple apps at the same time	yuuji.yaginuma	2017-07-13	1	-1/+2
\| \|/ / /
* \| \| \|	Merge pull request #29778 from yui-knk/fix_charset_doc	प्रथमेश Sonpatki	2017-07-13	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	`Response#charset=` uses `default_charset` when `nil` is passed	yui-knk	2017-07-13	1	-1/+1
\|/ / /
* \| \|	Merge pull request #29699 from lugray/represent_boolean_as_integer	Matthew Draper	2017-07-12	12	-8/+148
\|\ \ \
\| * \| \|	Change sqlite3 boolean serialization to use 1 and 0	Lisa Ugray	2017-07-11	12	-8/+148
* \| \| \|	Merge pull request #29764 from georgeclaghorn/third-party-cache-store-config	Matthew Draper	2017-07-12	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fix configuring third-party cache stores such as ActiveSupport::Cache::RedisS...	George Claghorn	2017-07-12	1	-1/+1
\|/ / / /
* \| \| \|	normalize_path used to be nil tolerant	Akira Matsuda	2017-07-12	2	-0/+5
* \| \| \|	Merge pull request #29746 from kamipo/extract_fake_klass	Rafael França	2017-07-11	3	-52/+38
\|\ \ \ \
\| * \| \| \|	Extract `FakeKlass` in `relation_test.rb` and `relation/mutation_test.rb`	Ryuta Kamizono	2017-07-11	3	-52/+38
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #29748 from koic/enable_layout_empty_line_after_magic_comment	Rafael França	2017-07-11	547	-0/+549
\|\ \ \ \
\| * \| \| \|	[Action Record] `rubocop -a --only Layout/EmptyLineAfterMagicComment`	Koichi ITO	2017-07-11	3	-0/+3
\| * \| \| \|	[Action View] `rubocop -a --only Layout/EmptyLineAfterMagicComment`	Koichi ITO	2017-07-11	3	-0/+3
\| * \| \| \|	[Action Pack] `rubocop -a --only Layout/EmptyLineAfterMagicComment`	Koichi ITO	2017-07-11	16	-0/+16
\| * \| \| \|	[Active Job] `rubocop -a --only Layout/EmptyLineAfterMagicComment`	Koichi ITO	2017-07-11	100	-0/+100
\| * \| \| \|	[Active Support] `rubocop -a --only Layout/EmptyLineAfterMagicComment`	Koichi ITO	2017-07-11	424	-0/+424
\| * \| \| \|	Enable Layout/EmptyLineAfterMagicComment cop	Koichi ITO	2017-07-11	1	-0/+3
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #29756 from yuki24/fix-english	Robin Dupret	2017-07-11	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fix english for the rescue_from warning [ci skip]	Yuki Nishijima	2017-07-11	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #29752 from palkan/master	Matthew Draper	2017-07-12	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix postgresql adapter setup for ActionCable tests	palkan	2017-07-11	1	-1/+1
\|/ / /
* \| \|	Merge pull request #29745 from y-yagi/fix_typo_in_method_name	Matthew Draper	2017-07-11	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix typo in method name	yuuji.yaginuma	2017-07-11	1	-1/+1
\|/ /
* \|	:scissors:	Ryuta Kamizono	2017-07-11	1	-1/+0
* \|	Add backticks for class names in CHANGELOG [ci skip]	Ryuta Kamizono	2017-07-11	1	-3/+3