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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \|	short arrays in inspect	Jan Bernacki	2013-10-30	3	-3/+19
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #12692 from dmathieu/session_fetch	Guillermo Iguaran	2013-10-29	3	-0/+37
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add session#fetch
\| * \| \| \| \| \| \|	add the fetch method to sessions	Damien Mathieu	2013-10-29	3	-0/+37
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #12693 from carpodaster/convert-cdata-input-to-string	Rafael Mendonça França	2013-10-29	2	-1/+5
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Convert CDATA input to string before gsub'ing
\| * \| \| \| \| \| \|	Convert CDATA input to string before gsub'ing	Carsten Zimmermann	2013-10-29	2	-1/+5
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails 3.2 API allowed arbitrary input for cdata_section; this change re-introduces the old behaviour.
* \| \| \| \| \| \|	Merge pull request #12690 from durrantm/minor_README_change	Yves Senn	2013-10-29	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify that visiting http://localhost:3000 should be done in a browser. [ci skip]
\| * \| \| \| \| \| \|	Clarify that visiting http://localhost:3000 should be done in a browser.	Michael Durrant	2013-10-29	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #12688 from simi/patch-1	Rafael Mendonça França	2013-10-29	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update testing.rake with more accurate description of test task.
\| * \| \| \| \| \| \|	Update testing.rake with more accurate description of test task.	Josef Šimánek	2013-10-29	1	-1/+1
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	According to #5ecd12 change. [ci skip]
* \| \| \| \| \| \|	Revert "add active model basics wip to guides/documents.yaml"	Xavier Noria	2013-10-29	1	-6/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reason: WIP guides are not in the index because they are partial work pushed to the repo. Either there is someone working on them or else the work was interrupted. Guides are added to the index page when they are finished, the author considers the draft to be complete, someone reviews them, and overall they are considered to be good for users to read. This reverts commit eefc03a8069bddfe31751c4bd4fb1804e7f33c2c.
* \| \| \| \| \| \|	Merge pull request #10664 from aderyabin/docpatch	Yves Senn	2013-10-29	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix doc in Postgres database creation [ci skip]
\| * \| \| \| \| \| \|	Fix doc in Postgres database creation	Andrey Deryabin	2013-06-25	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix broken delete_all test, which will now be failing since #delete_all is ↵	David Heinemeier Hansson	2013-10-28	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	broken
* \| \| \| \| \| \| \|	Add failing test for preloading with a polymorphic association and using the ↵	David Heinemeier Hansson	2013-10-28	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	existential predicate
* \| \| \| \| \| \| \|	Remove confusing generated-code commentary	Jeremy Kemper	2013-10-28	1	-4/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	fix template Gemfiles	Aaron Patterson	2013-10-28	3	-12/+25
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	always call set_default_accessors from create_root	Aaron Patterson	2013-10-28	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #11785 from grosser/grosser/file-unless-exist	Rafael Mendonça França	2013-10-28	3	-0/+12
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	support :unless_exist for FileCache Conflicts: activesupport/CHANGELOG.md activesupport/test/caching_test.rb
\| * \| \| \| \| \| \| \|	support :unless_exist for FileCache	grosser	2013-08-30	3	-0/+12
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	use a queue rather than a list. fixes #12069	Aaron Patterson	2013-10-28	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #11564 from zzak/active_model_guide	Yves Senn	2013-10-28	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Guides] Active Model Basics [ci skip]
\| * \| \| \| \| \| \| \| \|	add active model basics wip to guides/documents.yaml	Zachary Scott	2013-07-22	1	-0/+6
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	fix typo in comment [ci skip].	Yves Senn	2013-10-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Fix typo	David Heinemeier Hansson	2013-10-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Fix indentation [ci skip]	Carlos Antonio da Silva	2013-10-27	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #12578 from ↵	Rafael Mendonça França	2013-10-27	5	-3/+24
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	jeradphelps/configurable_schema_migrations_table_name Configurable name for schema_migrations table Conflicts: activerecord/CHANGELOG.md
\| * \| \| \| \| \| \| \| \| \|	added schema_migrations_table_name to ActiveRecord::Base in order that the ↵	Jerad Phelps	2013-10-27	5	-3/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	name of the schema migrations table can be configured. consolidated test_schema_migrations_table_name tests Added changelog entry edited changelog removed commented lines removed reader ensure the schema migrations table is reset at end of test added entry to configuration guide guides typo and changelog order
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #12668 from arunagw/aa-improvments	Rafael Mendonça França	2013-10-27	2	-7/+18
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test fixed for app_generator
\| * \| \| \| \| \| \| \| \| \| \|	Fixed tests for app_generator	Arun Agrawal	2013-10-27	2	-7/+18
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added test for jbuilder and web-console inclusion. Added README.rdoc for test default files
* \| \| \| \| \| \| \| \| \| \|	Remove warning of shadowing outer local variable	Rafael Mendonça França	2013-10-27	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Assert the return value in the test	Rafael Mendonça França	2013-10-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #12664 from jetthoughts/12242_includes_in_through_association	Rafael Mendonça França	2013-10-27	4	-2/+37
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Skip `include_values` from through associations chains for building association scope
\| * \| \| \| \| \| \| \| \| \| \|	Skip `include_values` from through associations chains for building target scope	Paul Nikitochkin	2013-10-27	4	-2/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes: #12242, #9517, #10240
* \| \| \| \| \| \| \| \| \| \| \|	Remove dead code after the skip_jbuilder option removal	Rafael Mendonça França	2013-10-27	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	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
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* origin/master: Removal of javascript related gems when creating an app Conflicts: railties/lib/rails/generators/app_base.rb
\| * \ \ \ \ \ \ \ \ \ \ \	Merge pull request #12657 from robin850/skip-javascript	Guillermo Iguaran	2013-10-27	5	-14/+21
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removal of javascript related files when creating an app
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Removal of javascript related gems when creating an app	Robin Dupret	2013-10-27	5	-14/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Commit 0417bc8 add the coffee-rails and javascript runtime gems even when passing the --skip-javascript option but this is not the desired behavior. Also remove all javascript related stuff in the generated application such as the vendor/assets/javascripts folder.
* \| \| \| \| \| \| \| \| \| \| \| \| \|	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]