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

	Commit message (Expand)	Author	Age	Files	Lines
*	Generate namespaced routes correctly for generators. Fix for #11532	Prathamesh Sonpatki	2013-08-14	3	-1/+58
*	Merge pull request #11807 from jetthoughts/11804_actions_are_public_methods	Steve Klabnik	2013-08-13	1	-0/+4
\|\
\| *	#11804: Add description of action in Getting Started Guide	Paul Nikitochkin	2013-08-13	1	-0/+4
* \|	Merge pull request #11847 from AJ-Acevedo/master	Steve Klabnik	2013-08-13	1	-1/+1
\|\ \
\| * \|	Updated outdated initialization guide [ci skip]	AJ Acevedo	2013-08-13	1	-1/+1
* \| \|	Add String#remove(pattern) as a short-hand for the common pattern of String#g...	David Heinemeier Hansson	2013-08-13	3	-0/+19
\| \|/ \|/\|
* \|	Merge pull request #11868 from rajcybage/fix_refute	Rafael Mendonça França	2013-08-13	2	-4/+4
\|\ \
\| * \|	using assert_not instead of refute	Rajarshi Das	2013-08-13	2	-4/+4
\|/ /
* \|	Merge pull request #11861 from sadjow/improve-doc-translations-active-record-...	José Valim	2013-08-13	1	-0/+13
\|\ \
\| * \|	Add plural form example for AR I18n section [ci skip]	Sadjow Leão	2013-08-13	1	-0/+13
\|/ /
* \|	renames the :abort deprecation behaviour to :raise	Xavier Noria	2013-08-13	3	-7/+7
* \|	fixes typo in CHANGELOG	Xavier Noria	2013-08-13	1	-1/+1
* \|	defines a new :abort deprecation behaviour that raises	Xavier Noria	2013-08-13	3	-5/+46
* \|	Merge pull request #11856 from dchelimsky/refactor-duration-inspect	Steve Klabnik	2013-08-12	1	-7/+7
\|\ \
\| * \|	Refactor Duration#inspect	David Chelimsky	2013-08-12	1	-7/+7
\|/ /
* \|	Merge pull request #11855 from dchelimsky/chop-is-faster	Rafael Mendonça França	2013-08-12	1	-1/+1
\|\ \
\| * \|	Use chop instead of singularize in Duration#inspect	David Chelimsky	2013-08-12	1	-1/+1
\|/ /
* \|	Merge pull request #11823 from fomede/add-jquery-ujs-reference-link	Steve Klabnik	2013-08-12	1	-1/+1
\|\ \
\| * \|	Add events reference link to the text about jquery-ujs [ci skip]	Sadjow Leão	2013-08-12	1	-1/+1
* \| \|	Merge pull request #11852 from prijutme4ty/guide_addition	Steve Klabnik	2013-08-12	1	-0/+6
\|\ \ \
\| * \| \|	Added comment to a guide about necessity of `:dependent` option for associati...	Ilya Vorontsov	2013-08-12	1	-0/+6
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #11838 from vipulnsward/drop_extra_var	Steve Klabnik	2013-08-12	1	-2/+2
\|\ \ \
\| * \| \|	drop extra variable	Vipul A M	2013-08-12	1	-2/+2
\| \| \|/ \| \|/\|
* \| \|	Use assert_not rather than refute	Piotr Sarnacki	2013-08-12	1	-5/+5
* \| \|	Merge pull request #11525 from Empact/nested_attributes_with_callbacks_bug	Piotr Sarnacki	2013-08-12	4	-11/+172
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Refactor NestedAttributesWithCallbacksTest for clarity	Ben Woosley	2013-08-12	1	-67/+66
\| * \|	Restore the use of `#add_to_target` for nested attribute updates on existing ...	Ben Woosley	2013-08-12	3	-15/+20
\| * \|	Fix interactions between :before_add callbacks and nested attributes assignment	Dr.(USA) Joerg Schray	2013-08-12	3	-11/+168
\|/ /
* \|	Merge pull request #11846 from gaurish/jdbc-upgrade	Guillermo Iguaran	2013-08-11	1	-6/+7
\|\ \
\| * \|	Upgrade ActiveRecord-JDBC-Adapter to master branch	Gaurish Sharma	2013-08-12	1	-6/+7
* \| \|	chmod -x	Akira Matsuda	2013-08-12	4	-0/+0
\|/ /
* \|	only reconnect if there was already an active connection	Aaron Patterson	2013-08-11	1	-1/+4
* \|	Merge pull request #11826 from etipton/enable_extensions_revertible	Rafael Mendonça França	2013-08-10	3	-1/+16
\|\ \
\| * \|	Make 'enable_extension' revertible	Eric Tipton	2013-08-10	3	-1/+16
\| \|/
* \|	Merge pull request #11799 from njakobsen/fix-controller-filter-callbacks	Rafael Mendonça França	2013-08-10	3	-1/+17
\|\ \
\| * \|	Execute conditional procs on controller filters only for current action.	Nicholas Jakobsen	2013-08-10	3	-1/+17
* \| \|	Merge pull request #11830 from cr0t/master	José Valim	2013-08-10	1	-0/+8
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Add author_name field to post_params to the engines docs	Sergey Kuznetsov	2013-08-10	1	-0/+8
\|/ /
* \|	Merge pull request #11820 from vipulnsward/remove_s2b	Rafael Mendonça França	2013-08-09	6	-37/+4
\|\ \
\| * \|	Remove redundant `string_to_binary` from type-casting	Vipul A M	2013-08-09	6	-37/+4
\|/ /
* \|	Merge pull request #11815 from yaotti/patch-1	Yves Senn	2013-08-08	1	-1/+1
\|\ \
\| * \|	Fix a broken link	Hiroshige Umino	2013-08-09	1	-1/+1
\|/ /
* \|	Merge pull request #11806 from jetthoughts/change_model_term_by_simple_word	Carlos Antonio da Silva	2013-08-08	1	-1/+1
\|\ \
\| * \|	Remove using of suffix with term. [ci skip]	Paul Nikitochkin	2013-08-08	1	-1/+1
\|/ /
* \|	Merge pull request #11802 from ko1/fix_field_encoding_for_mysql	Aaron Patterson	2013-08-07	4	-3/+14
\|\ \
\| * \|	Set field encoding to client_encoding for mysql adapter.	Koichi Sasada	2013-08-08	4	-3/+14
* \| \|	cast hstore values on write to be consistent with reading from the db.	Yves Senn	2013-08-08	4	-4/+34
\|/ /
* \|	Merge pull request #11331 from vipulnsward/remove_conditional	Aaron Patterson	2013-08-07	1	-8/+1
\|\ \
\| * \|	Remove conditional, since results are always an instance of `ActiveRecord::Re...	Vipul A M	2013-07-06	1	-8/+1
* \| \|	use `skip` so we can see what tests are not run	Aaron Patterson	2013-08-08	1	-6/+5
\| \|/ \|/\|