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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \| \| \| \|	Merge pull request #27945 from betesh/allow-frozen-hashes-to-as_json	Rafael Mendonça França	2017-02-08	3	-1/+16
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Allow ActiveRecord::Base.as_json to accept a frozen Hash	Isaac Betesh	2017-02-08	3	-1/+16
* \| \| \| \| \| \| \|	Merge pull request #27935 from namusyaka/fix-hidden-primary_key	Rafael França	2017-02-08	5	-1/+18
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix inspection behavior when the :id column is not primary key	namusyaka	2017-02-09	5	-1/+18
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #27940 from y-yagi/deprecate_halt_callback_chains_on_retur...	Rafael França	2017-02-08	7	-23/+7
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	remove `ActiveSupport.halt_callback_chains_on_return_false` from everywhere	yuuji.yaginuma	2017-02-08	4	-7/+0
\| * \| \| \| \| \| \|	deprecate `halt_callback_chains_on_return_false` instead of `halt_and_display...	yuuji.yaginuma	2017-02-08	3	-16/+7
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #27938 from y-yagi/remove_link_to_edgeapi	Jon Moss	2017-02-07	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	remove link to edgeapi [ci skip]	yuuji.yaginuma	2017-02-08	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #27232 from robin850/guides-linking	Xavier Noria	2017-02-07	2	-2/+43
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Automatically link to Ruby files referenced in notes [ci skip]	Robin Dupret	2017-02-07	1	-1/+19
\| * \| \| \| \| \| \|	Automatically inject the current Rails version in API links [ci skip]	Robin Dupret	2017-02-07	2	-1/+24
* \| \| \| \| \| \| \|	Remove unused code now that the deprecated file was removed	Rafael Mendonça França	2017-02-07	1	-2/+1
* \| \| \| \| \| \| \|	Merge pull request #25873 from schuetzm/warn_about_dirty_lock	Rafael Mendonça França	2017-02-07	3	-2/+18
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Deprecate locking of dirty records	Marc Schütz	2017-02-07	3	-2/+18
* \| \| \| \| \| \| \| \|	Deprecate halt_and_display_warning_on_return_false	Rafael Mendonça França	2017-02-07	2	-5/+16
* \| \| \| \| \| \| \| \|	Remove deprecated behavior that halts callbacks when the return is false	Rafael Mendonça França	2017-02-07	12	-188/+24
* \| \| \| \| \| \| \| \|	Document that string in if and unless option of callbacks are deprecated	Rafael Mendonça França	2017-02-07	1	-4/+4
* \| \| \| \| \| \| \| \|	Improve the exception message to direct people to all the possible values	Rafael Mendonça França	2017-02-07	1	-1/+2
* \| \| \| \| \| \| \| \|	Merge pull request #27608 from kamipo/remove_deprecated_passing_string_to_def...	Rafael França	2017-02-07	7	-116/+99
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Deprecate passing string to `:if` and `:unless` conditional options on `set_c...	Ryuta Kamizono	2017-02-04	5	-14/+68
\| * \| \| \| \| \| \| \|	Remove deprecated passing string to define callback	Ryuta Kamizono	2017-02-04	5	-103/+32
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #27933 from kamipo/revert_27682	Jeremy Daer	2017-02-07	2	-3/+3
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Revert "Remove useless `column_alias` in `subquery_for_count`"	Ryuta Kamizono	2017-02-07	2	-3/+3
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #27334 from kamipo/pk_and_ref_columns_should_be_identical_...	Jeremy Daer	2017-02-07	12	-31/+79
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	`primary_key` and `references` columns should be identical type	Ryuta Kamizono	2017-02-07	12	-31/+79
* \| \| \| \| \| \| \| \|	Merge pull request #27922 from martijn/reduce-actioncable-logging	Jeremy Daer	2017-02-07	2	-2/+2
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Move some ActionCable logs to debug level	Martijn Storck	2017-02-06	2	-2/+2
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #26378 from kamipo/decouple_building_arel_ast_for_uniquene...	Jeremy Daer	2017-02-06	4	-41/+51
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Add `:nodoc:` to `case_sensitive_comparison` and `case_insensitive_comparison`	Ryuta Kamizono	2017-01-20	2	-3/+3
\| * \| \| \| \| \| \| \| \|	Decouple the building Arel ASTs for uniqueness validator	Ryuta Kamizono	2016-12-25	4	-38/+48
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Remove useless `column_alias` in `subquery_for_count`	Ryuta Kamizono	2017-02-06	2	-5/+5
\| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #27389 from kamipo/fix_mysql_pk_dumping_correctly	Jeremy Daer	2017-02-06	11	-236/+191
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Restore custom primary key tests lost at #26266	Ryuta Kamizono	2017-02-04	1	-25/+43
\| * \| \| \| \| \| \| \|	Restore the behaviour of the compatibility layer for integer-like PKs	Ryuta Kamizono	2017-02-04	6	-174/+111
\| * \| \| \| \| \| \| \|	Correctly dump integer-like primary key with default nil	Ryuta Kamizono	2017-02-04	5	-40/+40
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #27884 from kamipo/deprecate_migration_keys	Jeremy Daer	2017-02-06	7	-6/+18
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Deprecate `ColumnDumper#migration_keys`	Ryuta Kamizono	2017-02-07	7	-6/+18
* \| \| \| \| \| \| \| \|	Merge pull request #27929 from kamipo/remove_useless_mysql_column_tests	Jeremy Daer	2017-02-06	1	-42/+0
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove useless `MySQL::Column` tests	Ryuta Kamizono	2017-02-07	1	-42/+0
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #27928 from y-yagi/remove_activemodel_testcase_from_lib	Rafael França	2017-02-06	4	-6/+5
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Remove `ActiveModel::TestCase` from lib	yuuji.yaginuma	2017-02-07	4	-6/+5
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #27919 from bf4/correct_spelling	Arthur Nogueira Neves	2017-02-06	21	-29/+29
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Correct spelling	Benjamin Fleischer	2017-02-05	21	-29/+29
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #27924 from kenta-s/add-test-for-datetime-blank	Rafael França	2017-02-06	3	-0/+12
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add tests for `blank?`	kenta-s	2017-02-06	3	-0/+12
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #27902 from kirs/yaml-column-error	Kasper Timm Hansen	2017-02-06	4	-10/+10
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Indicate action that failed in YamlColumn	Kir Shatrov	2017-02-05	4	-10/+10
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #27900 from y-yagi/add_arg_key_to_process_action_mailer_event	Kasper Timm Hansen	2017-02-05	3	-1/+25
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add `:args` to `process.action_mailer` event	yuuji.yaginuma	2017-02-04	3	-1/+25
\| \|/ / / / /