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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #9007 from dpree/master	Rafael Mendonça França	2013-01-20	1	-35/+46
\|\
\| *	Removed ActionController::Base dependency from abstract controller translatio...	Jens Bissinger	2013-01-20	1	-41/+46
\| *	Test abstract controller's localize method.	Jens Bissinger	2013-01-20	1	-0/+6
* \|	Merge pull request #8913 from seejee/regression_test_for_chained_preloaded_sc...	Carlos Antonio da Silva	2013-01-20	2	-0/+10
\|\ \
\| * \|	Added test case to prevent regression of chained, preloaded scopes. (#7490)	Chris Geihsler	2013-01-19	2	-0/+10
* \| \|	Refactor grep call to remove .each	Carlos Antonio da Silva	2013-01-20	1	-1/+1
* \| \|	Add missing assert calls	Carlos Antonio da Silva	2013-01-20	1	-2/+2
* \| \|	Use 1.9 hash style in docs/comments [ci skip]	Carlos Antonio da Silva	2013-01-20	1	-3/+3
* \| \|	Fix markdown formatting to highlight block in changelog [ci skip]	Carlos Antonio da Silva	2013-01-20	1	-2/+2
* \| \|	Merge pull request #9008 from ranjaykrishna/dbcreate	Guillermo Iguaran	2013-01-20	1	-0/+1
\|\ \ \
\| * \| \|	added db:drop task that executes mysql:drop_databses and postgresql:drop_data...	Ranjay Krishna	2013-01-20	1	-0/+1
* \| \| \|	Merge pull request #9006 from wangjohn/activerecord_transaction_state	Aaron Patterson	2013-01-20	4	-11/+49
\|\ \ \ \
\| * \| \| \|	Added a changelog entry.	wangjohn	2013-01-20	1	-0/+5
\| * \| \| \|	Removed reflects_transaction_state.	wangjohn	2013-01-20	1	-1/+0
\| * \| \| \|	Created state for a transaction and added tests.	wangjohn	2013-01-20	3	-11/+45
* \| \| \| \|	Merge pull request #9005 from ranjaykrishna/dbcreate	Aaron Patterson	2013-01-20	1	-0/+4
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	removed the puts statement and simplified the execute statement	Ranjay Krishna	2013-01-20	1	-6/+1
\| * \| \| \|	added rake db:create that executes mysql:build_databases and postgresql:build...	Ranjay Krishna	2013-01-20	1	-0/+9
* \| \| \| \|	Merge pull request #9004 from arunagw/warning_removed_shadowing_outer	Guillermo Iguaran	2013-01-20	1	-3/+3
\|\ \ \ \ \
\| * \| \| \| \|	Removing warning: shadowing outer local variable	Arun Agrawal	2013-01-20	1	-3/+3
\|/ / / / /
* \| \| \| /	strong parameters filters permitted scalars	Xavier Noria	2013-01-20	4	-39/+273
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Don't use anonymous classes in connection tests	Guillermo Iguaran	2013-01-19	1	-3/+5
\| \|/ / \|/\| \|
* \| \|	Anonymous class is not allowed. For reference see #8934 and bc43763247e25	Guillermo Iguaran	2013-01-19	1	-4/+6
* \| \|	Merge pull request #9002 from dahakawang/master	Aaron Patterson	2013-01-19	2	-0/+15
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	fix anonymous class issue	David	2013-01-20	2	-0/+15
\|/ /
* \|	Remove warning: shadowing outer local variable	Carlos Antonio da Silva	2013-01-19	1	-1/+1
* \|	Fix failing test about date.order translation values	Carlos Antonio da Silva	2013-01-19	1	-1/+1
* \|	Merge pull request #8978 from chrismcg/remove_i18n_symbol_dependency	Aaron Patterson	2013-01-19	3	-6/+12
\|\ \
\| * \|	Don't change the original i18n data	Chris McGrath	2013-01-17	1	-1/+1
\| * \|	Remove i18n symbol dependency	Chris McGrath	2013-01-17	3	-6/+12
* \| \|	Merge pull request #8081 from JoeyButler/refactor_cache_store	Rafael Mendonça França	2013-01-19	1	-25/+41
\|\ \ \
\| * \| \|	Refactor ActiveSupport::Cache::Store#fetch.	Joey Butler	2013-01-19	1	-25/+41
* \| \| \|	Merge pull request #9000 from sherwu/master	Rafael Mendonça França	2013-01-19	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Updated version of jQuery rails in gemfile	Sherwin Wu	2013-01-19	1	-1/+1
\|/ / /
* \| \|	Restore and adapt the implementation reverted at	Rafael Mendonça França	2013-01-19	5	-37/+114
* \| \|	Merge pull request #8999 from thomasfedb/raise_or_log_unpermitted_params	Rafael Mendonça França	2013-01-19	4	-6/+117
\|\ \ \
\| * \| \|	Added ability to raise or log on unpermitted params.	Thomas Drake-Brockman	2013-01-20	4	-6/+117
\|/ / /
* \| \|	Improve relation docs about to_sql and where_values_hash	Carlos Antonio da Silva	2013-01-19	1	-4/+4
* \| \|	Merge pull request #8977 from Soylent/master	Aaron Patterson	2013-01-18	2	-1/+5
\|\ \ \
\| * \| \|	Fix ActionDispatch::Request#formats when HTTP_ACCEPT header is empty string	Konstantin Papkovskiy	2013-01-17	2	-1/+5
* \| \| \|	Fix syntax error :grin:	Guillermo Iguaran	2013-01-18	1	-1/+1
* \| \| \|	Merge pull request #8995 from schneems/schneems/formatting-the-formatters	Guillermo Iguaran	2013-01-18	1	-6/+13
\|\ \ \ \
\| * \| \| \|	Remove "Application" section title from routes	schneems	2013-01-18	1	-6/+13
\|/ / / /
* \| \| \|	Merge pull request #8994 from Springest/fix_default_scope_update_all_delete_all	Jon Leighton	2013-01-18	3	-2/+33
\|\ \ \ \
\| * \| \| \|	Fix .update_all and .delete_all when using a condition on a joined table	Derek Kraan	2013-01-11	3	-2/+33
* \| \| \| \|	The test setup is not threadsafe. Wrap in a mutex.	Jon Leighton	2013-01-18	1	-3/+7
* \| \| \| \|	MiniTest already defines a ParallelEach class	Jon Leighton	2013-01-18	1	-23/+27
* \| \| \| \|	Revert "Merge pull request #8989 from robertomiranda/use-rails-4-find-by"	Guillermo Iguaran	2013-01-18	23	-70/+70
* \| \| \| \|	Merge pull request #8989 from robertomiranda/use-rails-4-find-by	Guillermo Iguaran	2013-01-18	23	-70/+70
\|\ \ \ \ \
\| * \| \| \| \|	User Rails 4 find_by	robertomiranda	2013-01-18	23	-70/+70