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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \| \| \|	general formatting cleanup, and clarify that passing true as third option ↵	Matt Jankowski	2011-07-01	1	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for benchmarking will stop output OTHER THAN the timing output itself
\| * \| \| \| \| \| \| \| \| \| \|	[asset pipeline] refactor docs and add new content	Richard Hulse	2011-07-01	1	-25/+162
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This changes the document around and adds more details about the rationale behind the pipeline. Still a WIP.
\| * \| \| \| \| \| \| \| \| \| \|	update doc about resetting the session in case of authenticity token mismatch	Vijay Dev	2011-07-01	1	-6/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Revert "Included w3c_validators gem and modified Migrations file"	Vijay Dev	2011-06-30	2	-28/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 1028226b00a3671a465b510880bd186ae26b2e3d. Reason: No code changes can be done in docrails.
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #49 from dyba/master	Daniel Dyba	2011-06-29	2	-12/+28
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Separated the ActiveRecord Supported Types in a separate section
\| \| * \| \| \| \| \| \| \| \| \| \|	Included w3c_validators gem and modified Migrations file	Daniel Dyba	2011-06-29	2	-12/+28
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	correct invalid HAVING query	Akira Matsuda	2011-06-29	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* GROUP BY value must appear in SELECT clause * ("created_at < ?", 1.month.ago) wasn't a very good example for HAVING. you'd better use WHERE for such a simple condition
\| * \| \| \| \| \| \| \| \| \| \| \|	correct invalid GROUP BY query	Akira Matsuda	2011-06-29	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GROUP BY value must appear in SELECT clause
\| * \| \| \| \| \| \| \| \| \| \| \|	[asset pipeline] Add production assets section	Ryan Bigg	2011-06-28	1	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	[asset pipeline] Add examples of javascript_include_tag and stylesheet_link_tag	Ryan Bigg	2011-06-28	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	[Asset pipeline] Move external assets section down to 'Adding assets to your ↵	Ryan Bigg	2011-06-28	1	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gems' section
\| * \| \| \| \| \| \| \| \| \| \| \|	[asset pipeline] production assets covered later in the guide	Ryan Bigg	2011-06-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	[asset pipeline] sections at the bottom of the asset pipeline guide should ↵	Ryan Bigg	2011-06-28	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	all be toplevel
\| * \| \| \| \| \| \| \| \| \| \| \|	[asset pipeline] Mention that hashed files are also picked up by Sprockets	Ryan Bigg	2011-06-28	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	[asset pipeline] Cascade -> Cascading	Ryan Bigg	2011-06-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	fix javascript case	Vijay Dev	2011-06-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	clarify which url would be used to cache a page when options are not ↵	Matt Jankowski	2011-06-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	provided to #cache_page to determine that url
\| * \| \| \| \| \| \| \| \| \| \| \|	elaborate on how web server configuration to check for static files on disk ↵	Matt Jankowski	2011-06-26	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	enables page caching to work without hitting the app server stack
\| * \| \| \| \| \| \| \| \| \| \| \|	correct error message for failed creation	Ray Baxter	2011-06-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	minor changes	Vijay Dev	2011-06-27	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	minor indentation fixes on a6293ff	Vijay Dev	2011-06-26	1	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Update changelog for querying guide	Ryan Bigg	2011-06-26	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Querying guide: add mention of scoped, unscoped and default_scope to ↵	Ryan Bigg	2011-06-26	1	-0/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	querying guide
\| * \| \| \| \| \| \| \| \| \| \| \|	Refer to sprockets + jammit as libraries, not gems	Ryan Bigg	2011-06-26	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	replace find(all) with all	Vijay Dev	2011-06-26	1	-3/+3
\| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	fix typo in method name	Vijay Dev	2011-06-25	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Revert "add missing methods supported by reversible migrations using the ↵	Vijay Dev	2011-06-25	2	-8/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	change method" This reverts commit 7f91eebae361f2f3a1558f6d899b372524509a2d. Reason: Incorrect documenting. The newly added methods to the list are not actually supported by reversible migrations.
\| * \| \| \| \| \| \| \| \| \| \|	Edited railties/guides/source/asset_pipeline.textile via GitHub	Mohammad Typaldos	2011-06-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	add missing methods supported by reversible migrations using the change method	Vijay Dev	2011-06-24	2	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Action Mailer Basics Guide: Added example on using mail(:template_path => ↵	Alberto Perdomo	2011-06-23	1	-2/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	..., :template_name => ...) to specify custom template files.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1964 from kommen/has_one_fix	Jon Leighton	2011-07-04	2	-1/+12
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Only call set_owner_attributes for has_one association if target exists. [3.1.0rc4]
\| * \| \| \| \| \| \| \| \| \| \|	Only call set_owner_attributes for has_one association if target exists.	Dieter Komendera	2011-07-04	2	-1/+12
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Revert "The rails gem doesn't have a lib directory - closes #1958."	Andrew White	2011-07-04	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RubyGems requires at least one require_path. This reverts commit e7fc5d1cad27e47d3d0149a2b9a61d074c30f225.
* \| \| \| \| \| \| \| \| \| \|	The rails gem doesn't have a lib directory - closes #1958.	Andrew White	2011-07-04	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #1957 from vijaydev/add-validator-gem	Xavier Noria	2011-07-04	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Add w3c_validators gem to the doc group to fix failing validation of guides
\| * \| \| \| \| \| \| \| \| \|	add w3c_validators gem to the doc group to fix failing validation of guides	Vijay Dev	2011-07-04	1	-0/+1
\|/ / / / / / / / / /
* \| \| \| \| \| / / / /	Use an instance variable to store the current masss assignment options	Andrew White	2011-07-04	2	-13/+18
\| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #1950 from dmathieu/require_railties	José Valim	2011-07-03	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add railties to the load path if it's not already there
\| * \| \| \| \| \| \| \| \|	Load the generators test helper and properly load it's test case	Damien Mathieu	2011-07-03	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #1941 from vijaydev/command-recorder-fix	Jon Leighton	2011-07-03	2	-14/+8
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Reversing the changes related to CommandRecorder
\| * \| \| \| \| \| \| \| \|	Reversing the changes done in c278a2c while still resolving #1857.	Vijay Dev	2011-07-02	2	-14/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The changes broke bulk migration tests and were fixed in 4d256bc6; however that brought back the issue of #1857 and so this commit goes back to the original scenario and just adds change_table to the list of methods which are to be recorded in the CommandRecorder. The method_missing now delegates all calls to the underlying connection as before.
* \| \| \| \| \| \| \| \| \|	Merge pull request #1948 from dmathieu/html_safe_numeric	José Valim	2011-07-03	2	-1/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All numerics should be html_safe
\| * \| \| \| \| \| \| \| \| \|	all numerics should be html_safe - Closes #1935	Damien Mathieu	2011-07-03	2	-1/+5
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #1945 from spohlenz/fix-engine-migrations-check	José Valim	2011-07-02	2	-1/+10
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix has_migrations? check in Rails::Engine
\| * \| \| \| \| \| \| \| \| \|	Fix has_migrations? check in Rails::Engine	Sam Pohlenz	2011-07-03	2	-1/+10
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #1925 from spohlenz/refactor-asset-paths	José Valim	2011-07-02	3	-9/+40
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Refactor sprockets asset paths to allow for alternate asset environments
\| * \| \| \| \| \| \| \| \| \|	Add documentation for asset_prefix and asset_environment	Sam Pohlenz	2011-07-03	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add tests for alternate asset prefix/environment	Sam Pohlenz	2011-07-01	2	-0/+13
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Refactor sprockets asset paths to allow for alternate asset environments	Sam Pohlenz	2011-07-01	1	-9/+18
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #1940 from dmathieu/missing_location	Santiago Pastorino	2011-07-02	3	-1/+18
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Provide a more explicit message when we try to redirect to a missing location