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

	Commit message (Expand)	Author	Age	Files	Lines
*	Fixing `as_json` method for ActiveRecord models.	Nicolás Hock Isaza	2011-09-29	2	-1/+11
*	Add CHANGELOG entries	Santiago Pastorino	2011-09-29	3	-1/+67
*	Don't call self.class unless necessary. Closes #3171.	Jon Leighton	2011-09-29	2	-2/+3
*	Merge pull request #3167 from dmitriy-kiriyenko/honour_rails_env_environment_...	José Valim	2011-09-29	2	-1/+17
\|\
\| *	Honour RAILS_ENV environment variable when running rake.	Dmitriy Kiriyenko	2011-09-29	2	-1/+17
\|/
*	javascript_path and stylesheet_path should honor the asset pipelining	Santiago Pastorino	2011-09-28	2	-2/+28
*	Merge pull request #3159 from elliterate/digest_auth_with_query_string	José Valim	2011-09-28	2	-1/+10
\|\
\| *	Fixed digest authentication for requests with a query string [#3158]	Colin Shield & Ian Lesperance	2011-09-28	2	-1/+10
* \|	Merge pull request #3156 from ihower/enhance_button_to_helper_v2	Santiago Pastorino	2011-09-28	2	-5/+19
\|\ \ \| \|/ \|/\|
\| *	Make button_to helper support "form" option which is the form attributes.	Wen-Tien Chang	2011-09-29	2	-5/+19
* \|	partial pass over the assets guide	Xavier Noria	2011-09-28	1	-15/+12
\|/
*	fixing typo in assets guide	Vijay Dev	2011-09-28	1	-1/+1
*	Merge pull request #3152 from rocky-jaiswal/fix-failed-ar-test	Jon Leighton	2011-09-28	2	-2/+2
\|\
\| *	Fixed failed test under 1.8.7 as map.keys order in indeterminable	Rocky Jaiswal	2011-09-28	2	-2/+2
\|/
*	Merge pull request #3150 from avakhov/patch-html-sanitizer-cqi-require	Santiago Pastorino	2011-09-27	1	-0/+1
\|\
\| *	add missing require to html sanitizer	Alexey Vakhov	2011-09-27	1	-0/+1
* \|	the infamous detail only spotted in GitHub diffs no matter how careful you we...	Xavier Noria	2011-09-27	1	-1/+1
* \|	partial pass over the asset pipeline	Xavier Noria	2011-09-27	1	-14/+17
\|/
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-09-28	6	-7/+32
\|\
\| *	copy edit d47c2c4	Vijay Dev	2011-09-28	1	-7/+1
\| *	fixing docs for delete_sql where quotes should be used in this example.	Diego Plentz	2011-09-26	1	-1/+1
\| *	Alert about the new Bundler require for asset gems	Nicolás Hock Isaza	2011-09-26	1	-1/+20
\| *	update ActionMailer example using last truncate helper method signature	Alexey Vakhov	2011-09-26	1	-2/+2
\| *	fix ActionMailer readme example	Alexey Vakhov	2011-09-26	1	-0/+2
\| *	Fixed typo that I added - doh.	Chris Kimpton	2011-09-26	1	-1/+1
\| *	Clarify that the Active Record config should just work automatically	Chris Kimpton	2011-09-26	1	-1/+5
\| *	add some notes on setup for Active Record tests	Chris Kimpton	2011-09-26	1	-0/+6
\| *	pluralize "locales" since that's what's used in other parts of the document, ...	Waynn Lue	2011-09-23	1	-2/+2
\| *	Changed "en-UK" to "en-GB"	Christopher Arrowsmith	2011-09-22	1	-1/+1
* \|	Merge pull request #3141 from jsl/make_ssl_configurable	José Valim	2011-09-27	4	-3/+13
\|\ \
\| * \|	Make the Rack::SSL middleware configurable	Justin Leitgeb	2011-09-26	4	-3/+13
\|/ /
* \|	partial pass over the asset pipeline guide	Xavier Noria	2011-09-26	1	-20/+22
* \|	Don't require a DB connection when setting primary key.	Jon Leighton	2011-09-26	3	-1/+20
* \|	Merge pull request #3138 from christos/correct_image_path_with_pipeline	Santiago Pastorino	2011-09-26	2	-2/+11
\|\ \
\| * \|	Refactor image_path to use asset_path directly	Christos Zisopoulos	2011-09-26	1	-1/+1
\| * \|	Correctly override image_path in sprockets rails_helper	Christos Zisopoulos	2011-09-26	2	-1/+10
* \| \|	Merge pull request #3136 from guilleiguaran/clear-digests-on-precompile	Santiago Pastorino	2011-09-26	2	-0/+22
* \| \|	Copy assets to nondigested filenames too	Santiago Pastorino	2011-09-26	2	-5/+11
\|/ /
* \|	Merge pull request #3030 from htanata/fix_habtm_select_query_method	Jon Leighton	2011-09-26	3	-4/+16
* \|	Just assert_equal here	Santiago Pastorino	2011-09-26	1	-1/+1
* \|	Merge pull request #3135 from christos/respect_assets_digest_value	Santiago Pastorino	2011-09-26	2	-1/+9
\|\ \
\| * \|	Give precedence to `config.digest = false` over manifest.yml asset digests	Christos Zisopoulos	2011-09-26	2	-1/+9
* \| \|	Fix belongs_to polymorphic with custom primary key on target.	Jon Leighton	2011-09-26	5	-18/+30
* \| \|	Encapsulate assets initialization in its own rake task.	José Valim	2011-09-26	1	-3/+7
* \| \|	image_tag should use /assets if asset pipelining is turned on. Closes #3126	Santiago Pastorino	2011-09-26	2	-0/+8
\|/ /
* \|	Make serializable_hash take attr values directly from attributes hash.	Jon Leighton	2011-09-26	3	-4/+23
* \|	CollectionProxy#replace should change the DB records rather than just mutatin...	Jon Leighton	2011-09-26	2	-1/+12
* \|	fix deprecation warning in cookie_store_test	Vijay Dev	2011-09-25	1	-1/+1
* \|	Merge pull request #3125 from dolzenko/master	José Valim	2011-09-25	2	-0/+6
\|\ \
\| * \|	Implement Mime::Type#respond_to? (consistently with #method_missing)	Evgeniy Dolzhenko	2011-09-25	2	-0/+6
\|/ /