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

	Commit message (Expand)	Author	Age	Files	Lines
*	Refactored to remove unused variable	Anupam Choudhury	2013-03-28	2	-3/+3
*	determine_constant_from_test_name does not swallow NoMethodErrors [Yves Senn]	Xavier Noria	2013-03-28	2	-0/+12
*	Add coffee-rails and javascript runtime to gemfile if skip_javascript is	Rafael Mendonça França	2013-03-28	1	-2/+9
*	Merge pull request #9944 from where/rebased-fulltext-spacial	Rafael Mendonça França	2013-03-27	13	-37/+108
\|\
\| *	Add support for FULLTEXT and SPATIAL indexes using the :type flag for MySQL.	Ken Mazaika	2013-03-27	13	-37/+108
\|/
*	Merge pull request #9964 from where/using-schema-dump	Rafael Mendonça França	2013-03-27	3	-2/+11
\|\
\| *	Dump the 'using' options for a SQL index into the schema.	Ken Mazaika	2013-03-27	3	-2/+11
\|/
*	Merge pull request #9523 from stopdropandrew/Instrumenter#instrument-yields-p...	Rafael Mendonça França	2013-03-27	4	-2/+16
\|\
\| *	ActiveSupport::Notifications::Instrumenter#instrument should yield	stopdropandrew	2013-03-02	4	-3/+16
* \|	Merge pull request #9955 from rubys/cleanup_app_gemfile	Rafael Mendonça França	2013-03-27	1	-17/+7
\|\ \
\| * \|	Remove buggy and unnecessary logic	Sam Ruby	2013-03-27	1	-7/+0
\| * \|	Cosmetic cleanup of generated Gemfile	Sam Ruby	2013-03-27	1	-17/+14
* \| \|	Fix syntax error	Rafael Mendonça França	2013-03-27	1	-1/+0
* \| \|	Merge pull request #9274 from KrzysiekJ/spaces_in_scope_names	Rafael Mendonça França	2013-03-27	2	-5/+17
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Use define_method when method name contains weird characters.	Krzysztof Jurewicz	2013-03-18	2	-5/+17
* \| \|	Merge pull request #8458 from lucisferre/improve-layout-override-fallback-beh...	Rafael Mendonça França	2013-03-27	4	-5/+68
\|\ \ \
\| * \| \|	Provides standard layout lookup behavior for method and proc cases	Chris Nicola	2013-03-27	4	-5/+67
* \| \| \|	Merge pull request #9954 from neerajdotname/space_after_entirely	Rafael Mendonça França	2013-03-27	1	-1/+1
\|\ \ \ \
\| * \| \| \|	entirelyby => 'entirely by'	Neeraj Singh	2013-03-27	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #9949 from vipulnsward/drop_yaml_error_constant	Rafael Mendonça França	2013-03-27	2	-4/+2
\|\ \ \ \
\| * \| \| \|	drop errors constant	Vipul A M	2013-03-27	2	-4/+2
* \| \| \| \|	Merge pull request #9952 from prathamesh-sonpatki/AR-typos	Rafael Mendonça França	2013-03-27	5	-5/+5
\|\ \ \ \ \
\| * \| \| \| \|	Fixed typos in activerecord	Prathamesh Sonpatki	2013-03-27	5	-5/+5
\|/ / / / /
* \| \| \| \|	Merge pull request #9947 from senny/strong_params_doc_for_complex_forms	Rafael Mendonça França	2013-03-27	1	-1/+25
\|\ \ \ \ \
\| * \| \| \| \|	mention strong parameters in complex forms section of the guides.	Yves Senn	2013-03-27	1	-1/+25
\| \|/ / / /
* \| \| \| \|	Merge pull request #8368 from SamSaffron/master	Rafael Mendonça França	2013-03-27	3	-3/+75
\|\ \ \ \ \
\| * \| \| \| \|	Make connection_handler overridable per thread	Sam Saffron	2013-03-27	3	-3/+75
* \| \| \| \| \|	Use thor master since 0.18.0 has a regression	Rafael Mendonça França	2013-03-27	1	-0/+1
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #9945 from vipulnsward/drop_var_in_validations	Carlos Antonio da Silva	2013-03-27	1	-2/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	drop variable assignment in validations	Vipul A M	2013-03-27	1	-2/+1
\|/ / / /
* \| \| \|	Merge pull request #9876 from macksmind/restore_cols_dropped_by_hstore_test	Rafael Mendonça França	2013-03-26	1	-15/+5
\|\ \ \ \
\| * \| \| \|	Combine tests and restore columns dropped by hstore testing	Mack Earnhardt	2013-03-26	1	-15/+5
* \| \| \| \|	Merge pull request #9928 from vipulnsward/fix_rename_auto_increment_mysql	Rafael Mendonça França	2013-03-26	6	-11/+27
\|\ \ \ \ \
\| * \| \| \| \|	respect auto_increment in rename_column for mysql	Vipul A M	2013-03-27	6	-11/+27
* \| \| \| \| \|	Merge pull request #9939 from dchapman1988/master	Rafael Mendonça França	2013-03-26	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	s/and and run/and runs/	David Chapman	2013-03-26	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #9937 from zolzaya/master	Rafael Mendonça França	2013-03-26	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fixed timezone mapping of Ulaanbaatar.	Zolzaya	2013-03-27	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #9923 from danmcclain/psql-concurrent-indexes	Rafael Mendonça França	2013-03-26	9	-35/+86
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Checks :algorithm argument for valid values	Dan McClain	2013-03-26	4	-1/+18
\| * \| \| \| \| \|	Adds support for concurrent indexing in PostgreSQL adapter	Dan McClain	2013-03-25	9	-35/+69
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #9930 from kennyj/bump_tzinfo	Santiago Pastorino	2013-03-25	2	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Bump TZInfo version to 0.3.37 based on version v2013b of the underlying tz data.	kennyj	2013-03-26	2	-2/+2
* \| \| \| \| \| \|	default RAILS_ENV to test if we're in a test task	Aaron Patterson	2013-03-25	1	-0/+4
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Fix typo	Rafael Mendonça França	2013-03-25	1	-1/+1
* \| \| \| \| \|	Merge pull request #9925 from senny/relative_guide_links	Steve Klabnik	2013-03-25	3	-18/+26
\|\ \ \ \ \ \
\| * \| \| \| \| \|	use relative links inside guides [ci skip]	Yves Senn	2013-03-25	3	-18/+26
* \| \| \| \| \| \|	The sql_type method called here is from	Rafael Mendonça França	2013-03-25	2	-7/+6
* \| \| \| \| \| \|	Merge pull request #9920 from senny/clean_up_testing_examples_for_action_mailer	Steve Klabnik	2013-03-25	2	-36/+26
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	move mailer testing examples into the testing guide.	Yves Senn	2013-03-25	2	-36/+26