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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \|	use the appropriate RDoc code markup	Damien Mathieu	2013-07-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Thanks @fxn
\| * \| \| \| \|	document the Rails::ConsoleMethods#helper and #controller methods	Damien Mathieu	2013-07-18	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes rails/rails#11362
\| * \| \| \| \|	Merge pull request #159 from rajcybage/my_fix	Rafael Mendonça França	2013-07-17	1	-4/+4
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes the test case of that plugins
\| \| * \| \| \| \|	fixes the test case of that plugins	Rajarshi Das	2013-07-18	1	-4/+4
\| \|/ / / / /
\| * \| \| \| \|	New output for scaffold generate [ci skip]	Rashmi Yadav	2013-07-17	1	-3/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Guides fixed typo in index.html.erb file [ci skip]	Arun Agrawal	2013-07-17	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' of github.com:rails/docrails	Thiago Pinto	2013-07-16	6	-20/+15
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Added Rack::Sendfile in rake about [ci skip]	Arun Agrawal	2013-07-15	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Rack Sendfile is coming as default now	Arun Agrawal	2013-07-15	1	-0/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Using ruby 1.9 syntax [ci skip]	Rashmi Yadav	2013-07-14	1	-2/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Array#to_formatted_s does not call each element's to_s anymore	Akira Matsuda	2013-07-11	1	-17/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Array#to_s calls each element's inspect since ruby 1.9
\| \| * \| \| \| \|	Add documentation for FileStore#increment and #decrement	Matt Stopa	2013-07-10	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \|	Add documentation for #clear on certain Store classes	Matt Stopa	2013-07-10	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip
\| \| * \| \| \| \|	Update the filestore documentation for clear	Matt Stopa	2013-07-09	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \|	Enhancing readability of options for delegate method	Thiago Pinto	2013-07-16	1	-0/+5
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #11416 from tigrish/master	Yves Senn	2013-07-21	3	-4/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename the I18n keys for associations' restrict_dependent_destroy errors
\| * \| \| \| \| \|	Remove ambiguity with pluralizations and I18n keys used for association ↵	Christopher Dell	2013-07-13	3	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	restrict_dependent_destroy errors
* \| \| \| \| \| \|	Merge pull request #11515 from prathamesh-sonpatki/edit-index-page	Yves Senn	2013-07-21	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed information about creating database [ci skip]
\| * \| \| \| \| \| \|	Removed information about creating database[ci skip]	Prathamesh Sonpatki	2013-07-20	1	-2/+2
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- As default index page is no longer in public folder, rails hits the welcome controller in railties for index action - If the database is not created or username and password are incorrect in database.yml, those errors are first shown before index action succeeds - welcome#index succeeds iff the database is created with correct details in database.yml - So this information about creating database is not required in the index template
* \| \| \| \| \| \|	Merge pull request #11521 from mking/release-notes-major-features	Guillermo Iguaran	2013-07-20	1	-2/+39
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Rails 4.0 release notes. Explain major features added and removed.
\| * \| \| \| \| \|	Rails 4.0 release notes. Explain major features added and removed. [ci skip]	Matthew King	2013-07-20	1	-2/+39
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #11508 from vipulnsward/extract_constants	Yves Senn	2013-07-20	1	-2/+2
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|	Extract verbs array from helper to a contant
\| * \| \| \| \|	Extract verbs array from helper to a constant	Vipul A M	2013-07-20	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #11507 from vipulnsward/av_typo-4	Guillermo Iguaran	2013-07-19	1	-2/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Fix test name typos
\| * \| \| \| \|	Fix test name typos	Vipul A M	2013-07-19	1	-2/+2
\|/ / / / /
* \| \| \| \|	Merge pull request #11501 from nishantmodak/patch-3	Yves Senn	2013-07-19	1	-0/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade guide. Renaming Indexes on tables. [ci skip]
\| * \| \| \| \|	Upgrade guide. Renaming Indexes on tables. [ci skip].	Nishant Modak	2013-07-19	1	-0/+2
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/rails/rails/commit/39eef1a565ef02e4dabc0811ef1bf4547ff9a60e#commitcomment-3672522
* \| \| \| \|	fix typo in Active Record Validations guide. [ci skip].	Yves Senn	2013-07-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #11498.
* \| \| \| \|	use the superclass implementation	Aaron Patterson	2013-07-18	2	-2/+4
\| \| \| \| \|
* \| \| \| \|	Merge pull request #11492 from maratvmk/concern_test	Yves Senn	2013-07-18	1	-6/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	remove duplication in concern_test
\| * \| \| \| \|	remove duplication in test	Marat Kazbekov	2013-07-18	1	-6/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #11491 from erichkist/ek-revert-unscope-patch	Rafael Mendonça França	2013-07-18	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Revert "Fix SyntaxError in guides sample code"
\| * \| \| \| \|	Revert "Fix SyntaxError in guides sample code"	Erich Kist	2013-07-18	1	-1/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit f573df32d43c413a5098721ba6151ff190c23c6c. The original idea of this documentation was to showcase the feature where you can remove some only queries attributes with a single key-value pair.
* \| \| \| \|	Use the canonical router on the CHANGELOG entry	Rafael Mendonça França	2013-07-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Thanks @egilburg [ci skip]
* \| \| \| \|	Fix examples of number_to_percentage	Rafael Mendonça França	2013-07-18	1	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge pull request #11483 from garysweaver/grammar_fix_in_upgrade_documentation	Santiago Pastorino	2013-07-17	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	grammar fix in upgrade documentation
\| * \| \| \| \|	grammar fix in upgrade documentation	Gary S. Weaver	2013-07-17	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #11485 from simi/mysql2	Guillermo Iguaran	2013-07-17	1	-3/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use latest mysql2.
\| * \| \| \| \| \|	Use latest mysql2.	Josef Šimánek	2013-07-18	1	-3/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #11457
* \| \| \| \| \|	Merge pull request #11465 from arunagw/removed_missleading_readme_link_doc	Xavier Noria	2013-07-17	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Fixed README link in API
\| * \| \| \| \|	Fixed README link in API [ci skip]	Arun Agrawal	2013-07-17	1	-1/+1
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	This should not be a link because it's creating a link with activesupport README right now
* \| \| \| \|	Merge pull request #11479 from henrikhodne/improve-ar-querymethods-includes-docs	Yves Senn	2013-07-17	1	-0/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Improve ActiveRecord::QueryMethods#includes docs [ci skip]
\| * \| \| \| \|	Improve ActiveRecord::QueryMethods#includes docs	Henrik Hodne	2013-07-17	1	-0/+8
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's not immediately clear whether you can pass in multiple relations or not. After going through the code a bit, I saw that the arguments are just appended to an array. Also, added nested relations example. [ci skip]
* \| \| \| \|	Merge pull request #11478 from newton10471/master	Yves Senn	2013-07-17	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	fixes plugin test for tutorial [ci skip]
\| * \| \| \| \|	fixes plugin test for tutorial	Matt Newton	2013-07-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge pull request #11469 from bvogel/master	Carlos Antonio da Silva	2013-07-17	4	-6/+6
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Update bcrypt-ruby stable version to 3.1
\| * \| \| \| \|	bcrypt-ruby stable is 3.1	Burkhard Vogel-Kreykenbohm	2013-07-17	4	-6/+6
\| \|/ / / /
* / / / /	Refactor to reduce number of loops	Andrew White	2013-07-17	1	-15/+25
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only build the missing_keys array once we have detected that there actually are missing keys by moving the check to be part of the block that performs the path substitution.
* \| \| \|	Fix failing test missed for the past year :(	Andrew White	2013-07-17	2	-3/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When optimized path helpers were re-introduced in d7014bc the test added in a328f2f broke but no-one noticed because it wasn't being run by the test suite. Fix the test by checking for nil values or empty strings after the args have been parameterized.
* \| \| \|	Added routing in test for actionpack	Arun Agrawal	2013-07-17	1	-2/+4
\| \| \| \|