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

	Commit message (Expand)	Author	Age	Files	Lines
*	Introduce UpgradeLegacySignedCookieJar to transparently upgrade existing sign...	Trevor Turk	2013-03-24	5	-100/+171
*	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	Aaron Pfeifer	2013-03-18	2	-3/+19
* \|	Merge pull request #9704 from trevorturk/warn-about-skipped-routes	Jeremy Kemper	2013-03-24	4	-35/+34
\|\ \
\| * \|	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
\|\ \ \
\| * \| \|	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	Sam Ruby	2013-03-24	1	-1/+3
\|/ / /
* \| \|	Merge pull request #9902 from robertomiranda/fix-release-task	Guillermo Iguaran	2013-03-24	1	-14/+2
\|\ \ \
\| * \| \|	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	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
* \| \|	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	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 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
\|\ \ \ \
\| * \| \| \|	Fix regex to strip quotations from hstore values	jlxw	2013-03-23	2	-2/+6
* \| \| \| \|	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.	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
\|\ \ \ \ \ \
\| * \| \| \| \| \|	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
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	enhance unscoped tests	Neeraj Singh	2013-03-23	1	-0/+4
\| * \| \| \|	unscoped works with named scope [ci skip]	Neeraj Singh	2013-03-23	1	-8/+0
* \| \| \| \|	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
* \| \| \| \|	Merge pull request #9880 from wangjohn/refactoring_attribute_assignment	Rafael Mendonça França	2013-03-23	1	-5/+5
\|\ \ \ \ \
\| * \| \| \| \|	Refactoring validate_missing_parameters to validate_required_parameters.	wangjohn	2013-03-23	1	-5/+5
\| \|/ / / /
* \| \| \| \|	Autoload the AlterTable class	Rafael Mendonça França	2013-03-23	1	-0/+1
* \| \| \| \|	Merge pull request #9888 from zzak/patch-1	Rafael Mendonça França	2013-03-23	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Don't use hash fragment for travis link	Zachary Scott	2013-03-23	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #9883 from prathamesh-sonpatki/AR-Typos	Rafael Mendonça França	2013-03-23	1	-9/+9
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Spelling 'PostgreSQL' correctly	Prathamesh Sonpatki	2013-03-23	1	-7/+7
\| * \| \| \|	Fixed typos in activerecord CHANGELOG	Prathamesh Sonpatki	2013-03-23	1	-3/+3
\|/ / / /
* \| \| \|	Merge branch 'schema'	Aaron Patterson	2013-03-22	10	-104/+230
\|\ \ \ \
\| * \| \| \|	add uuid primary key support	Aaron Patterson	2013-03-22	5	-3/+30
\| * \| \| \|	separate primary key from column type	Aaron Patterson	2013-03-22	1	-10/+11
\| * \| \| \|	push the mysql add_column up to the abstract adapter	Aaron Patterson	2013-03-22	4	-22/+35
\| * \| \| \|	allow multiple add columns	Aaron Patterson	2013-03-22	3	-6/+6
\| * \| \| \|	pull add_column_options! off the pg connection class	Aaron Patterson	2013-03-22	2	-13/+13