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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \|	Merge pull request #9918 from prathamesh-sonpatki/railties-typos	Steve Klabnik	2013-03-25	2	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed typo in railties/test
\| * \| \| \| \| \| \| \|	Fixed typo in railties/test	Prathamesh Sonpatki	2013-03-25	2	-2/+2
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #9916 from ↵	Rafael Mendonça França	2013-03-25	1	-4/+2
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	neerajdotname/no-exception-when-cookie-is-tampered-with nil is retuned if cookie is tampered with [ci skip]
\| * \| \| \| \| \| \|	if cookie is tampered with then nil is returned [ci skip]	Neeraj Singh	2013-03-25	1	-4/+2
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	if the given key is not found then verifier does raise `ActiveSupport::MessageVerifier::InvalidSignature` exception but this exception is resuced and finally nil is returned.
* \| \| \| \| \| \|	Merge pull request #9914 from prathamesh-sonpatki/controller-pluralize	Xavier Noria	2013-03-25	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Controller name pluralized
\| * \| \| \| \| \| \|	Controller name pluralized	Prathamesh Sonpatki	2013-03-25	1	-2/+2
\|/ / / / / / /
* \| \| \| \| \| \|	Fix jquery-as-default test to account for switch from gem to github source ↵	Jeremy Kemper	2013-03-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in #9904
* \| \| \| \| \| \|	Update tests for #9704, named route collisions	Jeremy Kemper	2013-03-24	2	-6/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fix named route collision in mount test fixture * Update controller named route precedence test
* \| \| \| \| \| \|	Tender love for #9909 :heart:	Jeremy Kemper	2013-03-24	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #9909 from trevorturk/9740	Jeremy Kemper	2013-03-24	5	-100/+171
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Transparently upgrade signed cookies when setting secret_key_base
\| * \| \| \| \| \| \|	Introduce UpgradeLegacySignedCookieJar to transparently upgrade existing ↵	Trevor Turk	2013-03-24	5	-100/+171
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	signed cookies generated by Rails 3 to avoid invalidating them when upgrading to Rails 4
* \| \| \| \| \| \| \|	Merge pull request #9881 from gkop/master	Jeremy Kemper	2013-03-24	3	-16/+43
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support .js.coffee views by default
\| * \| \| \| \| \| \| \|	Put coffee-rails in top-level of generated Gemfile	Gabe Kopley	2013-03-24	3	-16/+43
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	v3 of pull request based on additional feedback from @jeremy
* \| \| \| \| \| \| \|	Merge pull request #9912 from rwz/jbuilder-bump	Guillermo Iguaran	2013-03-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Relaxed jbuilder dependency and bumped version number
\| * \| \| \| \| \| \|	Relaxed jbuilder dependency and bumped version number	Pavel Pravosud	2013-03-25	1	-1/+1
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Newer version contains some generator bugfixes
* \| \| \| \| \| \|	Merge pull request #9489 from obrie/fix/overridden_defaults_changed_attributes	Jeremy Kemper	2013-03-24	2	-3/+19
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix ActiveRecord locking column defaults not getting persisted
\| * \| \| \| \| \| \|	Fix ActiveRecord locking column defaults not getting persisted	Aaron Pfeifer	2013-03-18	2	-3/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When partial inserts are enabled, overridden db defaults are ignored. This results in locking columns having a nil value for new records if the db default is null. This happens because the list of changed attributes for new records is always assumed to be empty. Solution: When a new record's default attributes are set, also initialize the list of changed attributes by comparing current values against what's stored as the column defaults in the database.
* \| \| \| \| \| \| \|	Merge pull request #9704 from trevorturk/warn-about-skipped-routes	Jeremy Kemper	2013-03-24	4	-35/+34
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Raise an ArgumentError when a clashing named route is defined
\| * \| \| \| \| \| \| \|	Tweak exception message to avoid giving potentially misleading suggestions	Trevor Turk	2013-03-20	1	-2/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Raise an ArgumentError when a clashing named route is defined	Trevor Turk	2013-03-19	4	-35/+33
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #9905 from docunext/master	Carlos Antonio da Silva	2013-03-24	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActiveSupport::MessageVerifier: Updated docs due to removal of serializer accessor
\| * \| \| \| \| \| \| \| \|	Updated docs due to removal of serializer accessor	Albert Lash	2013-03-24	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #9904 from rubys/jquery-rails-github	Guillermo Iguaran	2013-03-24	1	-1/+3
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Use jquery-rails from github
\| * \| \| \| \| \| \| \| \|	Use jquery-rails from github	Sam Ruby	2013-03-24	1	-1/+3
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	completes https://github.com/rails/rails/commit/6f3f0f86332004fcee5c2f05d52bbff08c22f980
* \| \| \| \| \| \| \| \|	Merge pull request #9902 from robertomiranda/fix-release-task	Guillermo Iguaran	2013-03-24	1	-14/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix update_version_rb task
\| * \| \| \| \| \| \| \| \|	Fix update_version_rb task	robertomiranda	2013-03-24	1	-14/+2
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #9901 from vipulnsward/fix_some_typos	Vijay Dev	2013-03-24	5	-5/+5
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Fix some typos
\| * \| \| \| \| \| \| \|	Fix some typos	Vipul A M	2013-03-24	5	-5/+5
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Fix test: ActiveSupport.version is returning now a Gem::Version instead of a ↵	Guillermo Iguaran	2013-03-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	String
* \| \| \| \| \| \| \|	Use jquery-rails from github (fix Gem::Version error)	Guillermo Iguaran	2013-03-23	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Ignore all pkg folders (including also top level one)	Guillermo Iguaran	2013-03-23	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #9897 from robertomiranda/ignore-pkg-folders	Rafael Mendonça França	2013-03-23	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore pkg folders
\| * \| \| \| \| \| \| \|	Ignore pkg folders	robertomiranda	2013-03-23	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #8501 from charliesome/version-to-s	Rafael Mendonça França	2013-03-23	17	-57/+63
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add #to_s method to VERSION modules
\| * \| \| \| \| \| \| \|	add changelog entry	Charlie Somerville	2013-03-24	1	-0/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	remove references to ::VERSION, replace with .version	Charlie Somerville	2013-03-21	9	-15/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add version method to top level modules	Charlie Somerville	2013-03-21	7	-42/+48
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'jlxw-patch-2'	Rafael Mendonça França	2013-03-23	2	-2/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #9184
\| * \| \| \| \| \| \| \| \|	Fix regex to strip quotations from hstore values	jlxw	2013-03-23	2	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously regex did not strip quotation marks where hstore values were multi-line strings.
* \| \| \| \| \| \| \| \| \|	Merge pull request #9891 from doabit/additional_index_support	Rafael Mendonça França	2013-03-23	11	-9/+125
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Custom index type support with :using. Closes #9451
\| * \| \| \| \| \| \| \| \| \|	Custom index type support with :using.	doabit	2013-03-24	11	-9/+125
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #9890 from prathamesh-sonpatki/CL-Typos	Rafael Mendonça França	2013-03-23	3	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	activemodel/CHANGELOG typo and change in test description
\| * \| \| \| \| \| \| \| \| \| \|	Changed 'args' to 'arguments' in test description	Prathamesh Sonpatki	2013-03-24	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fixed typo in activemodel/CHANGELOG	Prathamesh Sonpatki	2013-03-24	1	-1/+1
\|/ / / / / / / / / / /
* \| / / / / / / / / /	Better styles for the CSS [ci skip]	Rafael Mendonça França	2013-03-23	6	-76/+76
\| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #9889 from neerajdotname/unscoped	Rafael Mendonça França	2013-03-23	2	-8/+4
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Unscoped works with other named scope even without block form
\| * \| \| \| \| \| \| \| \|	enhance unscoped tests	Neeraj Singh	2013-03-23	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make it obvious that using unscoped with another scope without the block works
\| * \| \| \| \| \| \| \| \|	unscoped works with named scope [ci skip]	Neeraj Singh	2013-03-23	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update comment to reflect that unscoped works with named scope even when named scope is using without block form
* \| \| \| \| \| \| \| \| \|	Fix documentation markup [ci skip]	Rafael Mendonça França	2013-03-23	1	-0/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Review some CHANGELOG entries [ci skip]	Rafael Mendonça França	2013-03-23	1	-7/+8
\| \| \| \| \| \| \| \| \| \|