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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #7232 from kennyj/fix_7200	Carlos Antonio da Silva	2012-08-02	2	-1/+6
\|\
\| *	Backport #5168 to 3-2-stable. Fix a problem that NULLS is ignored by postgres...	kennyj	2012-08-02	2	-1/+6
* \|	Merge pull request #7235 from ffmike/mocha_12_2_compat	Carlos Antonio da Silva	2012-08-02	1	-1/+3
\|\\|
\| *	Fix ActiveSupport integration with Mocha > 0.12.1	Mike Gunderloy	2012-08-02	1	-1/+3
\|/
*	This entry is wrong	Santiago Pastorino	2012-08-01	1	-2/+0
*	Bump to 3.2.8.rc1	Santiago Pastorino	2012-08-01	9	-17/+17
*	Revert "Deprecate link_to_function and button_to_function helpers"	Rafael Mendonça França	2012-08-01	3	-28/+16
*	Revert "Deprecate `:mouseover` options for `image_tag` helper."	Rafael Mendonça França	2012-08-01	3	-42/+10
*	Revert "Deprecate ActiveSupport::JSON::Variable"	Rafael Mendonça França	2012-08-01	3	-23/+14
*	Fix CHANGELOGS	Rafael Mendonça França	2012-08-01	2	-14/+38
*	removes the deprecation of update_attribute	Xavier Noria	2012-08-01	2	-3/+2
*	revises the deprecation warning of update_attribute	Xavier Noria	2012-08-01	2	-2/+2
*	Revert "Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` op...	Rafael Mendonça França	2012-08-01	8	-188/+63
*	Revert "Deprecating composed_of in ActiveRecord"	Rafael Mendonça França	2012-08-01	5	-24/+7
*	Revert "Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql."	Jon Leighton	2012-08-01	8	-97/+38
*	Add missing CHANGELOG entries	Santiago Pastorino	2012-08-01	7	-10/+41
*	Merge pull request #7070 from jmazzi/3-2-stable	Rafael Mendonça França	2012-08-01	1	-3/+6
\|\
\| *	Update documentation for Rails::Application#env_config	Justin Mazzi	2012-07-16	1	-3/+6
* \|	Merge pull request #7147 from pferdefleisch/scaffold_controller_docs	Rafael Mendonça França	2012-07-31	1	-4/+3
* \|	Add CHANGELOG entry [ci skip]	Rafael Mendonça França	2012-07-31	1	-0/+8
* \|	Revert "Add update_columns and the suggestion of using update_columns	Rafael Mendonça França	2012-07-30	4	-78/+2
* \|	removes the AR session store from eager loaded code [fixes #7160]	Xavier Noria	2012-07-29	1	-1/+10
* \|	Merge pull request #7187 from frodsan/fix_test_help	Rafael Mendonça França	2012-07-28	1	-2/+2
\|\ \
\| * \|	Backport #6995 to 3-2 stable	Francesco Rodriguez	2012-07-28	1	-2/+2
\|/ /
* \|	missing require: the AR session store depends on the AP abstract store	Xavier Noria	2012-07-28	1	-0/+2
* \|	adds a missing require from Active Support	Xavier Noria	2012-07-28	1	-0/+1
* \|	Only require the `:rails_env` task where is needed.	Rafael Mendonça França	2012-07-27	1	-13/+13
* \|	Merge branch '3-2-rel' into 3-2-stable	Aaron Patterson	2012-07-26	17	-12/+57
\|\ \
\| * \|	updating release date	Aaron Patterson	2012-07-26	7	-7/+7
\| * \|	bumping to 3.2.7	Aaron Patterson	2012-07-26	9	-9/+9
\| * \|	updating the changelog	Aaron Patterson	2012-07-26	1	-0/+2
\| * \|	* Do not convert digest auth strings to symbols. CVE-2012-3424	Aaron Patterson	2012-07-26	1	-2/+2
\| * \|	updating the version	Aaron Patterson	2012-07-23	8	-16/+16
\| * \|	updating changelogs	Aaron Patterson	2012-07-23	7	-1/+44
* \| \|	Merge pull request #7164 from parndt/patch-4	Rafael Mendonça França	2012-07-25	1	-1/+1
\|\ \ \
\| * \| \|	Switched update_column recommendation in changelog to update_columns	Philip Arndt	2012-07-26	1	-1/+1
\|/ / /
* \| \|	Fix AR#update_columns tests on Ruby 1.8.7	Carlos Antonio da Silva	2012-07-25	1	-7/+7
* \| \|	Merge pull request #7159 from parndt/update_columns	Aaron Patterson	2012-07-25	3	-1/+77
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Suggest using update_columns instead of update_column.	Philip Arndt	2012-07-26	1	-1/+1
\| * \|	New #update_columns method.	Sebastian Martinez	2012-07-26	3	-0/+76
\|/ /
* \|	Bump Journey requirements to 1.0.4	Andrew White	2012-07-23	1	-1/+1
* \|	Hash#fetch(fetch) is not the same as doing hash[key]	Xavier Noria	2012-07-21	1	-1/+11
* \|	`validates_inclusion_of` and `validates_exclusion_of` now accept	Rafael Mendonça França	2012-07-20	5	-10/+60
* \|	Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql.	Jon Leighton	2012-07-20	8	-35/+108
* \|	Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3	Carlos Antonio da Silva	2012-07-19	1	-0/+3
* \|	Merge pull request #7108 from arunagw/mocha_bump	Rafael Mendonça França	2012-07-19	1	-1/+1
\|\ \
\| * \|	Bumping mocha!	Arun Agrawal	2012-07-19	1	-1/+1
\| \|/
* \|	Merge pull request #7080 from jfirebaugh/to_param_regression	Jon Leighton	2012-07-17	2	-1/+7
\|\ \
\| * \|	AR::Integration must be included after AM::Conversion	John Firebaugh	2012-07-17	2	-1/+7
\|/ /
* \|	Add support for optional root segments containing slashes	Andrew White	2012-07-17	2	-1/+27