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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \| \| \|	Revert "Merge pull request #7587 from elia/fix-too-eager-loading"	Rafael Mendonça França	2012-12-18	3	-17/+6
* \| \| \| \| \|	Merge pull request #8548 from garysweaver/postgresql_fallback_to_disable_user...	Rafael Mendonça França	2012-12-18	2	-4/+17
\|\ \ \ \ \ \
\| * \| \| \| \| \|	#5523 Add ability for postgresql adapter to disable user triggers in disable_...	Gary S. Weaver	2012-12-18	2	-4/+17
\|/ / / / / /
* \| \| \| \| \|	Fix changelog	David Heinemeier Hansson	2012-12-18	1	-3/+1
* \| \| \| \| \|	Merge	David Heinemeier Hansson	2012-12-18	22	-49/+374
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'uniqueness-validation-postgresql-arrays'	Carlos Antonio da Silva	2012-12-18	3	-35/+58
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Extract some methods	Carlos Antonio da Silva	2012-12-18	1	-16/+22
\| \| * \| \| \| \| \|	Change relation in place	Carlos Antonio da Silva	2012-12-18	1	-1/+1
\| \| * \| \| \| \| \|	Simplify value logic by always typecasting	Carlos Antonio da Silva	2012-12-18	1	-11/+5
\| \| * \| \| \| \| \|	Avoid unnecessary hashes with error options	Carlos Antonio da Silva	2012-12-18	1	-1/+4
\| \| * \| \| \| \| \|	Remove prepend_and_append requirement from AS	Carlos Antonio da Silva	2012-12-18	1	-3/+1
\| \| * \| \| \| \| \|	Refactor uniqueness validator logic a bit	Carlos Antonio da Silva	2012-12-18	1	-10/+5
\| \| * \| \| \| \| \|	Added support for validates_uniqueness_of in PostgreSQL array columns. Fixes:...	Pedro Padron	2012-12-18	3	-4/+31
\| \|/ / / / / /
\| * \| \| \| \| \|	Minor js review [ci skip]	Carlos Antonio da Silva	2012-12-18	1	-7/+7
\| * \| \| \| \| \|	Merge pull request #8389 from nashby/issue-8388	Steve Klabnik	2012-12-18	3	-3/+33
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	handle protocol option in stylesheet_link_tag and javascript_include_tag	Vasiliy Ermolovich	2012-12-18	3	-3/+33
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge pull request #8543 from schneems/schneems/html-route-error	Rafael Mendonça França	2012-12-17	6	-76/+81
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Format routes as html on debug page	schneems	2012-12-17	6	-76/+81
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge pull request #8542 from le0pard/fixed_ar_intrange	Rafael Mendonça França	2012-12-17	2	-5/+29
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	AR supporting new int4range and int8range data type on PostgreSQL >= 9.2. Fix...	Alexey	2012-12-17	2	-5/+29
\| * \| \| \| \| \| \|	Merge pull request #8528 from le0pard/fixed_ar_intrange	Rafael Mendonça França	2012-12-17	9	-5/+170
\| \|\\| \| \| \| \| \|
\| \| * \| \| \| \| \|	AR supporting new intrange data type on PostgreSQL >= 9.2	Alexey	2012-12-16	9	-5/+170
\| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge pull request #8521 from schneems/schneems/html-routes	Rafael Mendonça França	2012-12-17	4	-4/+80
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	HTML formatting to Rails::InfoController#routes	schneems	2012-12-17	4	-4/+80
* \| \| \| \| \| \| \|	Add app/models/concerns and app/controllers/concerns to the default directory...	David Heinemeier Hansson	2012-12-18	3	-0/+17
\|/ / / / / / /
* \| \| \| \| \| \|	Make conditional_layout? private and update documentation	Andrew White	2012-12-17	1	-15/+23
* \| \| \| \| \| \|	Merge pull request #8539 from frodsan/fix_as_basic_object	Carlos Antonio da Silva	2012-12-17	1	-2/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	fix AS::BasicObject :nodoc: [ci skip]	Francesco Rodriguez	2012-12-17	1	-2/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #8532 from ptn/add_missing_require	Xavier Noria	2012-12-16	1	-0/+3
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add missing requires to core_ext/integer/time	Pablo Torres	2012-12-16	1	-0/+3
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #8529 from schneems/schneems/debug-exceptions-extend-path	Steve Klabnik	2012-12-16	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	DebugExceptions `File.join` => `File.expand_path`	schneems	2012-12-16	1	-1/+1
* \| \| \| \| \| \|	Restored 'Working with Validation Errors'	Steve Klabnik	2012-12-16	1	-0/+140
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #8518 from rwz/inheritable-basic-object	Jeremy Kemper	2012-12-15	2	-2/+19
\|\ \ \ \ \ \
\| * \| \| \| \| \|	AS::BasicObject can be inherited from	Pavel Pravosud	2012-12-15	2	-2/+19
* \| \| \| \| \| \|	Add `ActiveModel::Validations::AbsenceValidator`, a validator to check the a...	Roberto Vasquez Angel	2012-12-15	5	-0/+131
* \| \| \| \| \| \|	Merge pull request #8519 from rubys/master	Rafael Mendonça França	2012-12-15	1	-2/+2
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Remove blank lines from generated Gemfile	Sam Ruby	2012-12-15	1	-2/+2
\|/ / / / / / /
* \| \| \| / / /	make an editing pass through the upgrading guide [ci skip]	Vijay Dev	2012-12-15	1	-30/+16
\| \|_\|_\|/ / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-12-15	15	-189/+435
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	copy editing [ci skip]	Vijay Dev	2012-12-15	3	-3/+3
\| * \| \| \| \|	bullets have fullstops too [ci skip]	Vijay Dev	2012-12-15	1	-4/+4
\| * \| \| \| \|	Revert "Add quotes to Numeric Passwords to force string(sqlserver)"	Vijay Dev	2012-12-15	1	-2/+0
\| * \| \| \| \|	Revert "Add quotes to Numeric Passwords to force string(jdbcmysql)"	Vijay Dev	2012-12-15	1	-2/+0
\| * \| \| \| \|	Revert "Add quotes to Numeric Passwords to force string(jdbcpostgresql)"	Vijay Dev	2012-12-15	1	-2/+0
\| * \| \| \| \|	Revert "Add quotes to Numeric Passwords to force string(MySql)"	Vijay Dev	2012-12-15	1	-2/+0
\| * \| \| \| \|	Revert "Add quotes to Numeric Passwords to force string(Postgres)"	Vijay Dev	2012-12-15	1	-2/+0
\| * \| \| \| \|	Change method is default since rails 3.1 [ci skip]	Gaurish Sharma	2012-12-14	1	-8/+1
\| * \| \| \| \|	Elaborate using `inverse_of` with presence validation	Jay Hayes	2012-12-13	1	-1/+2
\| * \| \| \| \|	Fix associations presence lost in steve's reformat	Jay Hayes	2012-12-13	1	-2/+2