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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \|	rewrites AR's reload documentation	Xavier Noria	2013-05-31	1	-4/+38
* \| \| \|	Add propery docs to ActionDispatch::Response [ci skip]	Steve Klabnik	2013-05-30	1	-3/+19
* \| \| \|	Merge pull request #10783 from wangjohn/rake_routes_additional_environment	Rafael Mendonça França	2013-05-30	1	-0/+12
\|\ \ \ \
\| * \| \| \|	Adding a test to make sure that using rake routes with the CONTROLLER	wangjohn	2013-05-29	1	-0/+12
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #10805 from pilaf/master	Steve Klabnik	2013-05-30	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fix word order in documentation for with_lock	Pedro Fayolle	2013-05-30	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #10803 from gsamokovarov/extract-deep-munge	Rafael Mendonça França	2013-05-30	3	-18/+27
\|\ \ \ \
\| * \| \| \|	Extract ActionDispatch::Request#deep_munge	Genadi Samokovarov	2013-05-30	3	-18/+27
\| \|/ / /
* \| \| \|	Merge pull request #10694 from steveklabnik/hsp_regression	Steve Klabnik	2013-05-30	3	-4/+17
\|\ \ \ \
\| * \| \| \|	Fix regression in has_secure_password.	Phil Calvin	2013-05-30	3	-4/+17
\|/ / / /
* \| \| \|	Merge pull request #10785 from senny/10782_routes_inspector_deals_with_contro...	Rafael Mendonça França	2013-05-30	2	-1/+10
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	`RoutesInspector` deals with routes using regexp as `:controller` option	Yves Senn	2013-05-30	2	-1/+10
\|/ / /
* \| \|	Merge pull request #10767 from jmondo/master	Carlos Antonio da Silva	2013-05-29	1	-1/+1
\|\ \ \
\| * \| \|	use grep over select for consistency and efficiency	John Gesimondo	2013-05-28	1	-1/+1
* \| \| \|	Merge pull request #10781 from arunagw/run-isolated-test	Rafael Mendonça França	2013-05-28	4	-37/+13
\|\ \ \ \
\| * \| \| \|	Running isolated tests	Arun Agrawal	2013-05-28	4	-37/+13
* \| \| \| \|	Merge pull request #10766 from kylerippey/minor_schema_migration_refactor	Rafael Mendonça França	2013-05-28	1	-18/+24
\|\ \ \ \ \
\| * \| \| \| \|	Minor refactor of ActiveRecord::SchemaMigration to remove references to Base,...	Kyle Rippey	2013-05-26	1	-18/+24
* \| \| \| \| \|	Merge pull request #10495 from senny/postgres_test_cleanup	Rafael Mendonça França	2013-05-28	2	-30/+30
\|\ \ \ \ \ \
\| * \| \| \| \| \|	cleanup, assert on warning from postgres adapter	Yves Senn	2013-05-08	1	-1/+1
\| * \| \| \| \| \|	cleanup, switch arguments in assert_equal calls	Yves Senn	2013-05-08	1	-29/+29
* \| \| \| \| \| \|	Merge branch 'fix-test_unit-railtie'	Rafael Mendonça França	2013-05-28	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	No need changelog entry	Rafael Mendonça França	2013-05-28	1	-2/+0
\| * \| \| \| \| \|	condition simplified	Oleg Sukhodolsky	2013-05-28	1	-1/+1
\| * \| \| \| \| \|	Merge pull request #10629 from stmpjmpr/bug_10628	Rafael Mendonça França	2013-05-28	2	-1/+3
\|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Fixes bug 10628.	Scott Hill	2013-05-15	2	-1/+3
* \| \| \| \| \| \|	Merge pull request #10755 from lukewendling/master	Rafael Mendonça França	2013-05-28	1	-0/+3
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	add notice to server boot messages if using default 0.0.0.0 binding	Luke Wendling	2013-05-25	1	-0/+3
* \| \| \| \| \| \|	Merge pull request #10775 from senny/postgres_adapter_test_cleanup	Rafael Mendonça França	2013-05-28	1	-5/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	test cleanup, replace `define_method` and `remove_method` with stubs.	Yves Senn	2013-05-28	1	-5/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #10769 from senny/10615_join_should_not_return_readonly_re...	Rafael Mendonça França	2013-05-27	5	-28/+29
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	`implicit_readonly` is being removed in favor of calling `readonly` explicitly	Yves Senn	2013-05-27	5	-24/+25
\| * \| \| \| \| \|	cleanup whitespace in `active_record/relation.rb`.	Yves Senn	2013-05-27	1	-4/+4
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #10763 from senny/10758_to_sentence_with_blank_elements	Carlos Antonio da Silva	2013-05-26	1	-0/+4
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|
\| * \| \| \| \|	add test-case for `Array#to_sentence with blank items.	Yves Senn	2013-05-26	1	-0/+4
\| \|/ / / /
* \| \| \| \|	Merge pull request #10762 from vipulnsward/change_compatibility	Carlos Antonio da Silva	2013-05-26	1	-3/+3
\|\ \ \ \ \
\| * \| \| \| \|	compatability => compatibility	Vipul A M	2013-05-26	1	-3/+3
\| \|/ / / /
* \| \| \| \|	Merge pull request #10761 from vipulnsward/fix-typo-1	Carlos Antonio da Silva	2013-05-26	4	-4/+4
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Fix some typo in method names, variables	Vipul A M	2013-05-26	4	-4/+4
\| \| \|_\|/ \| \|/\| \|
* / \| \|	Add note about decorator loading in Engines guide.	Steve Klabnik	2013-05-24	1	-0/+26
\|/ / /
* \| \|	Merge pull request #10222 from senny/update_bundler_section_in_assets_guide	Rafael Mendonça França	2013-05-23	1	-9/+7
\|\ \ \
\| * \| \|	asset guide, match application.rb snippets to the generated file [ci skip]	Yves Senn	2013-04-15	1	-9/+7
* \| \| \|	Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_many	Rafael Mendonça França	2013-05-23	4	-2/+15
\|\ \ \ \
\| * \| \| \|	Fix the `:primary_key` option for `has_many` associations.	Yves Senn	2013-05-23	4	-2/+15
* \| \| \| \|	Merge branch 'deprecate-validator-setup'	Rafael Mendonça França	2013-05-23	8	-42/+61
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	deprecate Validator#setup (to get rid of a respond_to call). validators do th...	Nick Sutterer	2013-05-23	8	-42/+61
\|/ / / /
* \| \| \|	Add CHANGELOG entry for 99860582b2b1c0fc42bf84c52aac57b243d42678	Rafael Mendonça França	2013-05-22	1	-0/+6
* \| \| \|	Require only minitest.	Rafael Mendonça França	2013-05-22	2	-2/+2
* \| \| \|	Merge pull request #10667 from rubys/minitest-autorun	Rafael Mendonça França	2013-05-22	2	-2/+2
\|\ \ \ \
\| * \| \| \|	Eliminate minitest warnings	Sam Ruby	2013-05-17	2	-2/+2