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

	Commit message (Expand)	Author	Age	Files	Lines
*	Fix ActiveModel tests that depend on run order	Francesco Rodriguez	2012-08-23	1	-6/+4
*	Fix ActiveSupport tests that depend on run order	Francesco Rodriguez	2012-08-23	4	-14/+23
*	Merge pull request #7434 from frodsan/select_list_arguments	Aaron Patterson	2012-08-23	2	-11/+20
\|\
\| *	Model.select takes a variable list of arguments.	Isaac Sanders	2012-08-23	2	-11/+20
\|/
*	Merge pull request #7061 from davidcelis/master	Vijay Dev	2012-08-23	1	-1/+3
\|\
\| *	Update the documentation for the :autosave option	David Celis	2012-08-23	1	-1/+3
\|/
*	Revert "Use join without default separator"	José Valim	2012-08-23	2	-2/+7
*	Fix failure on middleware/exceptions_test	José Valim	2012-08-23	2	-11/+5
*	Update the ducumentation about the before_eager_load callback [ci skip]	Rafael Mendonça França	2012-08-22	1	-1/+1
*	before_eager_load only runs when eager_load is true	Rafael Mendonça França	2012-08-22	1	-4/+4
*	skip the memcache tests if the memcache server is not up	Aaron Patterson	2012-08-22	2	-48/+50
*	revises a brittle test in Active Support	Xavier Noria	2012-08-22	2	-12/+22
*	edit secret token template comment [ci skip]	Vijay Dev	2012-08-23	1	-1/+1
*	copy edit the time_ago_in_words helper docs	Vijay Dev	2012-08-23	1	-4/+4
*	Merge pull request #7398 from iamvery/time_ago_in_words-docs	Vijay Dev	2012-08-22	1	-0/+7
\|\
\| *	Extended documentation for `time_ago_in_words` helper	Jay Hayes	2012-08-20	1	-0/+7
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-08-22	2	-19/+18
\|\ \
\| * \|	giving a pause usually made for e.g. in sentences [ci skip]	Soon Van	2012-08-21	1	-15/+14
\| * \|	Revert "association_basics, updated how inverse_of works"	Rafael Mendonça França	2012-08-20	1	-3/+2
\| * \|	association_basics, updated how inverse_of works	Olli Huotari	2012-08-20	1	-2/+3
\| * \|	Make a doc example output in match actual output	Evan Farrar	2012-08-15	1	-4/+4
* \| \|	Merge pull request #7413 from siong1987/secret_token	Carlos Antonio da Silva	2012-08-22	1	-0/+3
\|\ \ \
\| * \| \|	remind user a good way to generate a secret code.	Teng Siong Ong	2012-08-21	1	-0/+3
\|/ / /
* \| \|	Merge pull request #6606 from amatsuda/ar_relation_model_method	Rafael Mendonça França	2012-08-21	2	-0/+6
\|\ \ \
\| * \| \|	AR::Relation#model would be a better API than AR::Relation#klass	Akira Matsuda	2012-06-03	2	-0/+6
* \| \| \|	Add CHANGELOG entry for #3578 [ci skip]	Rafael Mendonça França	2012-08-21	2	-0/+10
* \| \| \|	Merge pull request #3578 from amatsuda/remove_j_alias_for_json_escape	Rafael Mendonça França	2012-08-21	1	-7/+0
\|\ \ \ \
\| * \| \| \|	Remove j alias for ERB::Util.json_escape	Akira Matsuda	2011-11-09	1	-7/+0
* \| \| \| \|	Remove app building setup/teardown for remote ip railtie tests	Carlos Antonio da Silva	2012-08-21	1	-14/+0
* \| \| \| \|	Set eager load option in "make_basic_app" for railties tests	Carlos Antonio da Silva	2012-08-21	1	-0/+1
* \| \| \| \|	Merge pull request #7225 from rails/eager_load	José Valim	2012-08-21	33	-109/+215
\|\ \ \ \ \
\| * \| \| \| \|	add Rack::Lock for webrick	Aaron Patterson	2012-08-21	1	-0/+9
\| * \| \| \| \|	Deprecate config.threadsafe!	José Valim	2012-08-21	4	-22/+20
\| * \| \| \| \|	Get rid of config.preload_frameworks in favor of config.eager_load_namespaces	José Valim	2012-08-21	23	-52/+80
\| * \| \| \| \|	Make ActiveSupport::Autoload local	José Valim	2012-08-21	3	-30/+45
\| * \| \| \| \|	Remove allow_concurrency as a flag	José Valim	2012-08-21	5	-12/+9
\| * \| \| \| \|	Allow users to choose when to eager_load the application or not.	José Valim	2012-08-21	9	-8/+67
* \| \| \| \| \|	Merge pull request #6499 from lazylester/patch-1	Carlos Antonio da Silva	2012-08-21	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Clarify and correct the description for the --full option of the plugin_new g...	lazylester	2012-08-21	1	-1/+1
* \| \| \| \| \| \|	Use a model without counter cache to test read-only attributes	Rafael Mendonça França	2012-08-21	1	-9/+10
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #5210 from Pliny/masteri	Rafael Mendonça França	2012-08-21	8	-2/+36
\|\ \ \ \ \ \
\| * \| \| \| \| \|	reset_counters() was crashing when there were multiple belongs_to association...	Dave Desrochers	2012-08-21	8	-2/+36
* \| \| \| \| \| \|	Add CHANGELOG entry for #7410	Rafael Mendonça França	2012-08-21	1	-0/+5
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #7410 from sandeepravi/default_options_helper_value	Rafael Mendonça França	2012-08-21	2	-0/+13
\|\ \ \ \ \ \
\| * \| \| \| \| \|	option_tags coerced to "" instead of nil	Sandeep	2012-08-21	2	-0/+13
* \| \| \| \| \| \|	Merge pull request #7409 from kennyj/refactor_activerecord_result	Rafael Mendonça França	2012-08-21	3	-18/+4
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Refactor AR::Result or inherits. Because we have redundant codes about	kennyj	2012-08-22	3	-18/+4
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #7408 from yahonda/sqlmode_mysql	Carlos Antonio da Silva	2012-08-21	2	-6/+8
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Rename to test_mysql_strict_mode_disabled_dont_override_global_sql_mode	Yasuo Honda	2012-08-22	2	-6/+8
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #7406 from janko-m/documentation_fixes	Rafael Mendonça França	2012-08-21	2	-45/+45
\|\ \ \ \ \ \