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

	Commit message (Expand)	Author	Age	Files	Lines
*	remove the skip_jbuilder option, just rm it from the Gemfile	Aaron Patterson	2013-10-27	1	-3/+0
*	add comments and fix variable name. oops, forgot to add this. orz!	Aaron Patterson	2013-10-27	1	-2/+2
*	remove unused methods	Aaron Patterson	2013-10-27	1	-4/+0
*	Merge remote-tracking branch 'origin/master'	Aaron Patterson	2013-10-27	5	-12/+21
\|\
\| *	Merge pull request #12657 from robin850/skip-javascript	Guillermo Iguaran	2013-10-27	5	-14/+21
\| \|\
\| \| *	Removal of javascript related gems when creating an app	Robin Dupret	2013-10-27	5	-14/+21
* \| \|	add an option to skip jbuilder	Aaron Patterson	2013-10-27	1	-0/+4
* \| \|	fix variable name	Aaron Patterson	2013-10-27	2	-3/+3
* \| \|	add jbuilder web-console and sdoc to the GemEntry list	Aaron Patterson	2013-10-27	3	-29/+33
* \| \|	fix the class name	Aaron Patterson	2013-10-27	1	-17/+17
* \| \|	refactor Gemfile template	Aaron Patterson	2013-10-27	1	-8/+6
* \| \|	use the GemfileGem object for more entries	Aaron Patterson	2013-10-27	3	-56/+53
* \| \|	add the database gem	Aaron Patterson	2013-10-27	3	-9/+8
* \| \|	get a list of gems when filling out the gemfile	Aaron Patterson	2013-10-27	3	-13/+42
\|/ /
* \|	set accessors in the set_accessors! method	Aaron Patterson	2013-10-27	2	-2/+2
* \|	Merge pull request #12661 from robin850/patch-10	Rafael Mendonça França	2013-10-27	1	-0/+8
\|\ \
\| * \|	Add a changelog entry for #12656 [ci skip]	Robin Dupret	2013-10-27	1	-0/+8
* \| \|	Add a note about ensuring the version is right for the adapter (since you mig...	David Heinemeier Hansson	2013-10-27	1	-1/+1
\|/ /
* \|	Merge pull request #12656 from dougcole/fix_strong_parameters_fetch	Guillermo Iguaran	2013-10-26	2	-1/+14
\|\ \
\| * \|	don't mutate hash with fetch	Doug Cole	2013-10-26	2	-1/+14
\|/ /
* \|	Merge pull request #12655 from rails/ps-remove-surprise-if-in-show-exception-...	Santiago Pastorino	2013-10-26	1	-2/+5
\|\ \
\| * \|	Remove surprise if from show_exception middleware	Prem Sichanugrist	2013-10-27	1	-2/+5
\|/ /
* \|	Merge pull request #12648 from chrisledet/patch-1	Rafael Mendonça França	2013-10-25	1	-2/+2
\|\ \
\| * \|	Fixed typo with after_commit docs	Chris Ledet	2013-10-25	1	-2/+2
\|/ /
* \|	Merge pull request #12643 from severin/pg_cast_json_on_write	Yves Senn	2013-10-25	3	-0/+26
\|\ \
\| * \|	cast json values on write to be consistent with reading from the db.	Severin Schoepke	2013-10-25	3	-0/+26
* \| \|	prevent `time_zone_aware_attributes` test leak. follow-up to #12633.	Yves Senn	2013-10-25	1	-21/+21
* \| \|	only warn on leaked time zone state instead of rasing an error.	Yves Senn	2013-10-25	1	-3/+6
* \| \|	Merge pull request #12633 from senny/no_more_time_zone_leaks	Yves Senn	2013-10-25	12	-214/+223
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	prevent global timezone state from leaking out of test cases.	Yves Senn	2013-10-25	12	-214/+223
* \| \|	Merge pull request #12642 from ka8725/fix_usage_for_model_generators	Rafael Mendonça França	2013-10-25	1	-1/+1
\|\ \ \
\| * \| \|	Improve usage example for model generator	Andrey Koleshko	2013-10-25	1	-1/+1
* \| \| \|	Merge pull request #12641 from jetthoughts/12640_updated_migrations_doc_to_us...	Rafael Mendonça França	2013-10-25	1	-2/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix migration docs to use new remove_column semantics	Paul Nikitochkin	2013-10-25	1	-2/+2
* \| \| \|	Merge pull request #12490 from senny/store_accessor_hstore_bug	Yves Senn	2013-10-24	8	-14/+127
\|\ \ \ \
\| * \| \| \|	`ActiveRecord::Store` works together with PG `hstore` columns.	Yves Senn	2013-10-25	6	-14/+88
\| * \| \| \|	`stored_attributes` need to be specific to a subclass.	Yves Senn	2013-10-25	3	-0/+21
\| * \| \| \|	test to verify the `ActiveRecord::Store` behavior with PG's json type	Yves Senn	2013-10-25	1	-0/+18
\|/ / / /
* \| \| \|	Merge pull request #12621 from laurocaetano/fix_has_one_association_with_prim...	Rafael Mendonça França	2013-10-24	3	-1/+24
\|\ \ \ \
\| * \| \| \|	Save association when primary key is manually set	laurocaetano	2013-10-24	3	-1/+24
* \| \| \| \|	Merge pull request #12636 from kongregate/dont_rescue_Exceptions	Rafael Mendonça França	2013-10-24	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Avoid unnecessary catching of Exception instead of StandardError (converting ...	stopdropandrew	2013-10-24	1	-2/+2
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Improve the test code for #8422	Rafael Mendonça França	2013-10-24	1	-4/+4
* \| \| \| \|	Merge pull request #8491 from igagnidz/master	Rafael Mendonça França	2013-10-24	1	-0/+10
\|\ \ \ \ \
\| * \| \| \| \|	Added test to ensure that DescendantsTracker does not leak memory on singleto...	Iuri Gagnidze	2012-12-09	1	-0/+10
* \| \| \| \| \|	Merge pull request #12632 from al2o3cr/fix_race_for_attribute_methods	Aaron Patterson	2013-10-24	1	-6/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	always check to see if methods exist after calling define_attribute_methods	Matt Jones	2013-10-24	1	-6/+3
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Add CHANGELOG entry for #12635 [ci skip]	Rafael Mendonça França	2013-10-24	1	-0/+4
* \| \| \| \| \|	Merge pull request #12635 from mperham/4-0-stable	Guillermo Iguaran	2013-10-24	1	-1/+0
* \| \| \| \| \|	Merge pull request #10471 from andyw8/button_to_params	Rafael Mendonça França	2013-10-24	3	-0/+19
\|\ \ \ \ \ \