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

	Commit message (Expand)	Author	Age	Files	Lines
*	add test to ensure `remove_reference` with index and fk is invertable.	Yves Senn	2015-02-11	1	-0/+5
*	fix `remove_reference` with `foreign_key: true` on MySQL. #18664.	Yves Senn	2015-02-11	3	-0/+24
*	Merge pull request #18890 from kamipo/remove_cast_type	Yves Senn	2015-02-11	1	-1/+1
\|\
\| *	Remove `cast_type` in `ColumnDefinition`	Ryuta Kamizono	2015-02-11	1	-1/+1
* \|	guides, various testing guide changes. [ci skip]	Yves Senn	2015-02-11	1	-7/+15
* \|	Merge pull request #18363 from andreynering/add-foreign-key-subsection-in-upg...	Yves Senn	2015-02-11	1	-0/+16
\|\ \
\| * \|	Adding subsection on 'upgrading' guide about 4.2 foreign key support [ci skip]	Andrey Nering	2015-02-10	1	-0/+14
* \| \|	Merge pull request #18892 from robertzk/typo_in_rails_engine_rb	Zachary Scott	2015-02-10	1	-4/+4
\|\ \ \
\| * \| \|	Fix some typos in railties/lib/rails/engine.rb [ci-skip]	RobertZK	2015-02-10	1	-4/+4
\|/ / /
* \| \|	Merge pull request #18891 from robertzk/typo_in_rails_application_rb	Arthur Nogueira Neves	2015-02-10	1	-2/+2
\|\ \ \
\| * \| \|	Fix typo in Rails::Application#migration_railties	RobertZK	2015-02-10	1	-2/+2
\|/ / /
* \| \|	Merge pull request #18889 from kamipo/use_kwargs_in_transaction	Rafael Mendonça França	2015-02-11	1	-6/+4
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Use keyword argument in `transaction`	Ryuta Kamizono	2015-02-11	1	-6/+4
\|/ /
* \|	Merge pull request #18884 from rails/fix-kwarg-on-stale	Rafael Mendonça França	2015-02-10	2	-1/+2
\|\ \
\| * \|	Fix wrong kwarg "record" from #18872	claudiob	2015-02-10	2	-1/+2
\|/ /
* \|	Merge pull request #18872 from kaspth/kw-fresh_when-stale	Arthur Nogueira Neves	2015-02-10	1	-12/+10
\|\ \
\| * \|	Convert stale? and fresh_when to use keyword arguments.	Kasper Timm Hansen	2015-02-10	1	-12/+10
* \| \|	Dont check bundler output on plugin generator test	Arthur Neves	2015-02-10	1	-4/+2
* \| \|	Actually fix the build	Sean Griffin	2015-02-10	1	-1/+1
* \| \|	Merge pull request #18877 from prathamesh-sonpatki/ar-changelog-typos-2	Rafael Mendonça França	2015-02-10	1	-2/+2
\|\ \ \
\| * \| \|	Fixed typos in ActiveRecord CHANGELOG [ci skip]	Prathamesh Sonpatki	2015-02-11	1	-2/+2
* \| \| \|	Merge pull request #12257 from vipulnsward/end_on_find_in_batches	Rafael Mendonça França	2015-02-10	4	-13/+50
\|\ \ \ \
\| * \| \| \|	Add an option `end_at` to `find_in_batches`	Vipul A M	2015-02-09	4	-13/+50
* \| \| \| \|	Fix the build	Sean Griffin	2015-02-10	1	-1/+1
\| \|/ / / \|/\| \| \|
* \| \| \|	Refactor microsecond precision to be database agnostic	Sean Griffin	2015-02-10	11	-84/+55
* \| \| \|	Merge pull request #18860 from alex-handley/enhancement/dependent_documentati...	Rafael Mendonça França	2015-02-10	1	-1/+1
\|\ \ \ \
\| * \| \| \|	[ci skip] corrects documentation for the default dependent behaviour	Alex Handley	2015-02-09	1	-1/+1
* \| \| \| \|	Maintain a consistent order in `ActiveRecord::Base#attributes`	Sean Griffin	2015-02-10	2	-1/+21
* \| \| \| \|	Merge pull request #18808 from carlosramireziii/i18n-doc-update	Robin Dupret	2015-02-10	1	-0/+19
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Document lazy lookup behavior for controllers	Carlos Ramirez III	2015-02-03	1	-0/+19
* \| \| \| \|	Change `LockingType` to use `DelegateClass`	Sean Griffin	2015-02-09	1	-1/+1
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Merge pull request #18841 from yuki24/remove-warning-from-av-tags-translator	Rafael Mendonça França	2015-02-09	1	-1/+3
\|\ \ \ \
\| * \| \| \|	Remove warning from ActionView::Helpers::Tags::Translator	Yuki Nishijima	2015-02-08	1	-1/+3
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #18849 from kamipo/array_type_is_a_part_of_sql_type	Sean Griffin	2015-02-09	2	-19/+4
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	An array type is a part of `sql_type`	Ryuta Kamizono	2015-02-08	2	-19/+4
* \| \| \|	tests, reset global to previous value.	Yves Senn	2015-02-09	1	-1/+3
* \| \| \|	Merge pull request #18839 from yuki24/remove-warning-from-generators-named-ba...	Yves Senn	2015-02-09	1	-10/+0
\|\ \ \ \
\| * \| \| \|	Remove warning from generator named base test	Yuki Nishijima	2015-02-08	1	-10/+0
* \| \| \| \|	Merge pull request #18840 from yuki24/remove-warning-from-plugin-generator	Yves Senn	2015-02-09	1	-3/+3
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Remove warning from Plugin Generator	Yuki Nishijima	2015-02-08	1	-3/+3
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #18764 from tsun1215/master	Andrew White	2015-02-08	3	-0/+33
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Explicitly ignored wildcard verbs from head_routes	Terence Sun	2015-02-08	3	-0/+33
\|/ / /
* \| \|	Move #18833 changelog to the top [ci skip]	Carlos Antonio da Silva	2015-02-08	1	-35/+33
* \| \|	Remove debug code	Carlos Antonio da Silva	2015-02-08	1	-5/+0
* \| \|	Merge pull request #18850 from kamipo/fix_rounding_problem_for_postgresql_tim...	Andrew White	2015-02-08	5	-19/+50
\|\ \ \
\| * \| \|	Fix rounding problem for PostgreSQL timestamp column	Ryuta Kamizono	2015-02-08	5	-19/+50
\|/ / /
* \| \|	Merge pull request #18602 from kamipo/respect_database_charset_and_collation	Andrew White	2015-02-08	3	-5/+21
\|\ \ \
\| * \| \|	Respect the database default charset for `schema_migrations` table.	Ryuta Kamizono	2015-02-08	3	-5/+21
\| \|/ /
* \| \|	Merge pull request #18848 from kamipo/add_auto_increment_method	Andrew White	2015-02-08	2	-3/+7
\|\ \ \
\| * \| \|	Add `auto_increment?` instead of `extra == 'auto_increment'`	Ryuta Kamizono	2015-02-08	2	-3/+7
\| \|/ /