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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #1813 from arunagw/jruby_tests	José Valim	2011-06-22	1	-3/+18
\|\
\| *	Tests added when no option is given with #jruby. It should generate	Arun Agrawal	2011-06-22	1	-0/+8
\| *	Making tests according to the changes #jruby	Arun Agrawal	2011-06-22	1	-3/+4
\| *	Test added for jdbc-adapter	Arun Agrawal	2011-06-22	1	-0/+6
* \|	Merge pull request #1778 from spohlenz/hash-models	José Valim	2011-06-22	3	-1/+28
\|\ \ \| \|/ \|/\|
\| *	Use real hash model in nested fields_for with hash model test	Sam Pohlenz	2011-06-22	2	-4/+13
\| *	Test for extractable_options? within nested fields_for.	Sam Pohlenz	2011-06-20	2	-1/+19
* \|	Merge pull request #1811 from nicksieger/more-jruby-gem-for-database-fixes-ma...	Aaron Patterson	2011-06-21	5	-23/+88
\|\ \
\| * \|	Use non-'jdbc*' names so that db:create and db:drop work	Nick Sieger	2011-06-21	3	-9/+9
\| * \|	Convert database names to ones appropriate for JRuby	Nick Sieger	2011-06-21	1	-1/+12
\| * \|	Add generic 'jdbc' database option	Nick Sieger	2011-06-21	2	-4/+67
\| * \|	Remove superfluous pg driver install instructions	Nick Sieger	2011-06-21	1	-9/+0
\|/ /
* \|	Require helpers so autoload is properly setup.	José Valim	2011-06-21	1	-1/+1
* \|	Merge pull request #1632 from tardate/pg_schema_fu	Aaron Patterson	2011-06-21	4	-50/+285
\|\ \
\| * \	Merge remote branch 'rails/master' into pg_schema_fu	Paul Gallagher	2011-06-19	95	-542/+1294
\| \|\ \
\| * \| \|	Make PostgreSQL adapter view-compatible	Paul Gallagher	2011-06-19	3	-4/+54
\| * \| \|	make extract_schema_and_table a private method	Paul Gallagher	2011-06-11	2	-27/+24
\| * \| \|	remove table quoting in primary_key method	Paul Gallagher	2011-06-11	3	-6/+48
\| * \| \|	apply private method indentation convention	Paul Gallagher	2011-06-10	3	-25/+25
\| * \| \|	Improve PostgreSQL adapter schema-awareness	Paul Gallagher	2011-06-10	3	-27/+173
* \| \| \|	Merge pull request #1793 from jamesarosen/clean_images	José Valim	2011-06-21	2	-2/+16
\|\ \ \ \
\| * \| \| \|	Railties: added tests for rake assets:clean	James A. Rosen	2011-06-21	2	-2/+16
\| * \| \| \|	rake assets:clean also removes directories	James A. Rosen	2011-06-21	1	-1/+1
* \| \| \| \|	Bump sprockets requirement	Joshua Peek	2011-06-21	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #1803 from guilleiguaran/uglifier-1-0	José Valim	2011-06-21	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Use uglifier from rubygems instead of git repo	Guillermo Iguaran	2011-06-21	1	-1/+1
* \| \| \| \|	Don't use deprecated stuff.	José Valim	2011-06-21	1	-2/+1
* \| \| \| \|	Assign Rails.cache to sprockets	Joshua Peek	2011-06-21	1	-0/+4
* \| \| \| \|	Create an :assets group in the Gemfile.	José Valim	2011-06-21	7	-23/+48
* \| \| \| \|	Rename AV::Helpers::AssetPaths to AV::AssetPaths to solve autoload mess.	José Valim	2011-06-21	4	-81/+84
* \| \| \| \|	Add Rails.groups to encapsulate available groups for require.	José Valim	2011-06-21	2	-0/+38
\|/ / / /
* \| \| \|	Merge pull request #1786 from gazay/3-1-stable-regexp-fix	José Valim	2011-06-20	3	-12/+0
\|\ \ \ \
\| * \| \| \|	Removed tests for rescue branch for Rails 2.x compatibility	Alexey Gaziev	2011-06-20	2	-9/+0
\| * \| \| \|	Removed rescue branch for Rails 2.x compatibility	Alexey Gaziev	2011-06-20	1	-3/+0
\| * \| \| \|	Fix regexp in generators for right catching error message	Alexey Gaziev	2011-06-20	1	-1/+1
* \| \| \| \|	Merge pull request #1787 from cmeiklejohn/make_fragment_for_more_robust_for_s...	José Valim	2011-06-20	1	-6/+4
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Only mark the sliced buffer as safe, if it was safe to begin with.	Christopher Meiklejohn	2011-06-20	1	-1/+2
\| * \| \| \|	Streamline fragment_for SafeBuffer logic to make it more concise.	Christopher Meiklejohn	2011-06-20	1	-6/+3
\|/ / / /
* \| \| \|	Merge pull request #1785 from medwezys/master	José Valim	2011-06-20	2	-2/+10
\|\ \ \ \
\| * \| \| \|	Do not change a frozen text passed to simple_format text helper	Tadas Tamosauskas	2011-06-20	2	-2/+10
* \| \| \| \|	Merge pull request #1784 from gazay/3-1-stable-shadowing-variables	José Valim	2011-06-20	3	-8/+8
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Removed shadowing variable warning in activerecord railties	Alexey Gaziev	2011-06-20	1	-1/+1
\| * \| \| \|	Removed warnings about shadowing variables	Alexey Gaziev	2011-06-20	2	-7/+7
* \| \| \| \|	Merge pull request #1780 from dazuma/fix_missing_require_set	José Valim	2011-06-20	1	-0/+2
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Add missing require 'set'	Daniel Azuma	2011-06-20	1	-0/+2
\|/ / / /
* \| \| \|	Merge pull request #1776 from jamesarosen/clean_images	Joshua Peek	2011-06-19	1	-1/+1
\|\ \ \ \
\| * \| \| \|	assets:clean task now cleans up images	James A. Rosen	2011-06-19	1	-1/+1
\| \|/ / /
* / / /	Call super here to allow SessionHash initialize new stuff for us	Santiago Pastorino	2011-06-19	1	-1/+1
\|/ / /
* \| \|	Merge pull request #1770 from arunagw/require_relative_remove	José Valim	2011-06-19	1	-3/+0
\|\ \ \
\| * \| \|	Removing require_relative gem. Linecache new version 0.46 is out and it's loa...	Arun Agrawal	2011-06-19	1	-3/+0