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

	Commit message (Collapse)	Author	Age	Files	Lines
...
*	Merge pull request #4893 from bcardarella/mark_for_highlight	José Valim	2012-02-05	3	-16/+19
\|\ \| \| \| \|	Highlight defaults to HTML5 `mark` element
\| *	Highlight defaults to HTML5 `mark` element	Brian Cardarella	2012-02-05	3	-16/+19
\| \|
* \|	Merge pull request #4881 from al2o3cr/compatible_json_errors	Jeremy Kemper	2012-02-05	3	-6/+83
\|\ \ \| \|/ \|/\|	Make ActiveResource error parsing interoperate with ActionController. Closes #4881.
\| *	add handling for backwards-compatibility and update documentation	Matt Jones	2012-02-04	3	-4/+67
\| \|
\| *	Merge remote-tracking branch 'odorcicd/fix_activeresource_json_errors' into ↵	Matt Jones	2012-02-04	2	-4/+18
\| \|\ \| \| \| \| \| \| \| \| \|	compatible_json_errors
\| \| *	Fix ActiveResource JSON error parser and incorrect tests	Denis Odorcic	2011-09-16	2	-4/+18
\| \| \|
* \| \|	Merge pull request #4892 from bkzl/master	José Valim	2012-02-05	2	-12/+14
\|\ \ \ \| \| \| \| \| \| \| \|	Display annotations from .coffee files in `rake notes`
\| * \| \|	Display annotations from .coffee files in `rake notes`	Bartlomiej Kozal	2012-02-05	2	-12/+14
\|/ / /
* \| \|	Merge pull request #4891 from kennyj/fix_4883	Santiago Pastorino	2012-02-05	2	-3/+4
\|\ \ \ \| \| \| \| \| \| \| \|	[master] Optional start_day argument for Time#all_week.
\| * \| \|	Optional start_day argument for Time#all_week.	kennyj	2012-02-06	2	-3/+4
\|/ / / \| \| \| \| \| \| \| \| \|	Closes #4883
* \| \|	Merge pull request #4888 from kennyj/fix_2982	José Valim	2012-02-05	2	-1/+7
\|\ \ \ \| \| \| \| \| \| \| \|	Add a testcase for non english filename. Related to #2982.
\| * \| \|	Add testcase for non english filename. Related to #2982.	kennyj	2012-02-05	2	-1/+7
\| \| \| \|
* \| \| \|	Merge pull request #4886 from bogdan/callbacks_cleanup	José Valim	2012-02-05	1	-17/+13
\|\ \ \ \ \| \|/ / / \|/\| \| \|	AS::Callbacks: remove unused code
\| * \| \|	AS::Callbacks: remove unused code	Bogdan Gusiev	2012-02-05	1	-17/+13
\|/ / /
* \| \|	Merge pull request #4875 from sikachu/master-asset-url	José Valim	2012-02-05	6	-2/+203
\|\ \ \ \| \| \| \| \| \| \| \|	Add *_url helpers to get the full assets URL
\| * \| \|	Add *_url helpers to get the full assets URL	Prem Sichanugrist	2012-02-04	6	-2/+203
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds `image_url`, `javascript_url`, `stylesheet_url`, `audio_url`, `video_url`, and `font_url` to assets tag helper. These URL helpers will return the full path to your assets. This is useful when you are going to reference this asset from external host.
* \| \|	Clean up a bit default_response handling and cache format negotiation.	José Valim	2012-02-04	2	-19/+17
\| \| \|
* \| \|	Merge pull request #4869 from sikachu/master-responder-fix	José Valim	2012-02-04	4	-8/+60
\|\ \ \ \| \| \| \| \| \| \| \|	Fix override API response bug in respond_with
\| * \| \|	Fix override API response bug in respond_with	Prem Sichanugrist	2012-02-03	4	-8/+60
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Default responder was only using the given respond block when user requested for HTML format, or JSON/XML format with valid resource. This fix the responder so that it will use the given block regardless of the validity of the resource. Note that in this case you'll have to check for object's validity by yourself in the controller. Fixes #4796
* \| \|	Merge pull request #4879 from kennyj/fix_4873	José Valim	2012-02-04	2	-2/+9
\|\ \ \ \| \| \| \| \| \| \| \|	Fix GH #4873. Allow swapping same class middleware.
\| * \| \|	Fix GH #4873. Allow swapping middleware of same class	kennyj	2012-02-04	2	-2/+9
\|/ / /
* \| \|	remove unasserted line in test	Vijay Dev	2012-02-04	1	-1/+0
\| \| \|
* \| \|	make the ONLY env variable used in guides generation work with kindle guides	Vijay Dev	2012-02-04	1	-1/+1
\| \| \|
* \| \|	Merge pull request #4877 from bogdan/drop_per_key	José Valim	2012-02-04	4	-49/+46
\|\ \ \ \| \| \| \| \| \| \| \|	AS::Callbacks: rip out per_key option.
\| * \| \|	AS::Callbacks: rip out per_key option.	Bogdan Gusiev	2012-02-04	4	-49/+46
\| \| \| \|
* \| \| \|	mention how to generate guides for the Kindle [ci skip]	Vijay Dev	2012-02-04	1	-2/+14
\| \| \| \|
* \| \| \|	document config.active_record.dependent_restrict_raises in the configuring ↵	Vijay Dev	2012-02-04	1	-0/+2
\|/ / / \| \| \| \| \| \| \| \| \|	guide [ci skip]
* \| \|	Merge pull request #4866 from bogdan/terminate_after_callbacks	José Valim	2012-02-04	5	-7/+12
\|\ \ \ \| \|/ / \|/\| \|	AS::Callbacks#define_callbacks: add :terminate_after_callbacks option
\| * \|	AS::Callbacks: :skip_after_callbacks_if_terminated option	Bogdan Gusiev	2012-02-03	5	-7/+12
\| \| \|
* \| \|	Merge pull request #4865 from bogdan/deprecate_per_key	José Valim	2012-02-03	2	-8/+6
\|\ \ \ \| \| \| \| \| \| \| \|	AC::Callbacks: remove usage of :per_key option from filters
\| * \| \|	AC::Callbacks: remove usage of :per_key option from filters	Bogdan Gusiev	2012-02-03	2	-8/+6
\| \|/ /
* \| \|	Merge pull request #4863 from norman/unicode	Vijay Dev	2012-02-03	1	-0/+2
\|\ \ \ \| \| \| \| \| \| \| \|	Added note about new Unicode version.
\| * \| \|	Added note about new Unicode version.	Norman Clarke	2012-02-03	1	-0/+2
\| \| \| \|
* \| \| \|	Merge pull request #4862 from norman/unicode	José Valim	2012-02-03	3	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \|	Update Unicode database to recently-released 6.1.
\| * \| \|	Update Unicode database to recently-released 6.1.	Norman Clarke	2012-02-03	3	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	http://www.geek.com/articles/geek-pick/unicode-6-1-released-complete-with-emoji-characters-and-a-pile-of-poo-2012022/
* \| \| \|	Merge pull request #4861 from arunagw/verbose_test_output	José Valim	2012-02-03	6	-0/+6
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Verbose output for tests.
\| * \| \|	Verbose output for tests.	Arun Agrawal	2012-02-03	6	-0/+6
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	See #3892
* \| \|	Merge pull request #4860 from carlosantoniodasilva/generators-hide-namespace	José Valim	2012-02-03	4	-1/+25
\|\ \ \ \| \|/ / \|/\| \|	Add convenience method to hide a generator from the available ones
\| * \|	Add convenience method to hide a generator from the available ones	Carlos Antonio da Silva	2012-02-03	4	-1/+25
\|/ / \| \| \| \| \| \| \| \| \| \|	It is usually useful to be able to hide a generator when running rails generate command. Such generators might be used only to dry up generators code and shouldn't be available to end users.
* \|	Merge pull request #4856 from ihid/store_null_bug	Aaron Patterson	2012-02-02	4	-3/+16
\|\ \ \| \| \| \| \| \|	Allow store to be a not null column.
\| * \|	Allow store to be a not null column.	Jeremy Walker	2012-02-02	4	-3/+16
\| \| \|
* \| \|	*args is already an array. :'(	Aaron Patterson	2012-02-02	1	-1/+1
\| \| \|
* \| \|	Merge pull request #4853 from rafaelfranca/fix-build-again	Aaron Patterson	2012-02-02	2	-6/+5
\|\ \ \ \| \| \| \| \| \| \| \|	columns method doesn't have name argument
\| * \| \|	columns method doesn't have name argument	Rafael Mendonça França	2012-02-02	2	-6/+5
\|/ / /
* \| \|	removed whitespace errors ↵	Aaron Patterson	2012-02-02	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	:yellow_heart::blue_heart::purple_heart::heart::green_heart:
* \| \|	Merge pull request #4851 from carlosantoniodasilva/collection-helpers	José Valim	2012-02-02	10	-51/+793
\|\ \ \ \| \| \| \| \| \| \| \|	Collection radio buttons / check boxes helpers
\| * \| \|	Remove default class to collection_check_boxes and	Rafael Mendonça França	2012-02-02	6	-36/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	collection_radio_buttons [Carlos Antonio da Silva + Rafael Mendonça França]
\| * \| \|	Allow collection radio_buttons/check_boxes to access current text/value	Carlos Antonio da Silva	2012-02-02	3	-0/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Carlos Antonio da Silva + Rafael Mendonça França]
\| * \| \|	Add changelog, docs and guides entries	Carlos Antonio da Silva	2012-02-02	4	-20/+193
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Carlos Antonio da Silva + Rafael Mendonça França]
\| * \| \|	Allow proc for value/text method in collection_select	Carlos Antonio da Silva	2012-02-02	3	-16/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And options_from_collection_for_select as well. [Carlos Antonio da Silva + Rafael Mendonça França]