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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #6148 from twinturbo/head-fix	José Valim	2012-05-03	1	-0/+66
\|\
\| *	Remove content-length as well	twinturbo	2012-05-03	1	-0/+6
\| *	Make ActionController#head pass rack-link	twinturbo	2012-05-03	1	-0/+60
* \|	Allows assert_redirected_to to accept a regular expression	Andy Lindeman	2012-05-03	1	-0/+4
* \|	Reset the request parameters after a constraints check	Andrew White	2012-05-02	1	-0/+19
* \|	Merge pull request #6125 from ncri/master	José Valim	2012-05-02	1	-1/+32
\|\ \
\| * \|	added proc evaluation for action cache's layout parameter	Nico	2012-05-02	1	-1/+32
* \| \|	Enable ActionDispatch::Http::Headers to support fetch	Mark Turner	2012-05-02	1	-0/+5
\|/ /
* \|	ActionPack: remove tests for hash_for_* methods	Bogdan Gusiev	2012-05-02	1	-18/+0
* \|	distance_of_time_in_words: Add/tweak comments to understand time intervals be...	Elliot Winkler	2012-04-30	1	-11/+20
* \|	distance_of_time_in_words: 45-60 days is about 2 months, not about 1 month	Elliot Winkler	2012-04-30	1	-1/+3
\|/
*	Merge pull request #5705 from lest/patch-3	Jeremy Kemper	2012-04-30	1	-0/+5
\|\
\| *	split CDATA end token in cdata_section helper	Sergey Nartimov	2012-04-30	1	-0/+5
* \|	Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_stores	José Valim	2012-04-30	1	-0/+7
\|\ \
\| * \|	Support cookie jar options for all cookie stores	brainopia	2012-04-30	1	-0/+7
* \| \|	Merge pull request #6082 from brainopia/smarter_cookie_jar	José Valim	2012-04-30	1	-8/+36
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Dont stream back cookie value if it was set to the same value	brainopia	2012-04-30	1	-0/+12
\| * \|	Dont set cookie header for deletion of unexisting data	brainopia	2012-04-30	1	-8/+24
* \| \|	Merge pull request #3726 from JanDupal/fix-date-helper-hidden	José Valim	2012-04-30	1	-0/+32
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	fix Helpers::DateHelper with :use_hidden - hide separators	Jan Dupal	2011-11-22	1	-0/+32
* \| \|	Merge pull request #6077 from dmitriy-kiriyenko/improve_signature_of_time_in_...	José Valim	2012-04-30	2	-37/+61
\|\ \ \
\| * \| \|	Replace boolean argument with an options hash.	Dmitriy Kiriyenko	2012-04-30	2	-37/+61
* \| \| \|	Merge pull request #6078 from lest/patch-4	José Valim	2012-04-30	1	-0/+11
\|\ \ \ \
\| * \| \| \|	allow send_file/send_data to skip disposition header, closes #2973	Sergey Nartimov	2012-04-30	1	-0/+11
\| \|/ / /
* / / /	wrap translate defaults to use translate helper features, closes #1102	Sergey Nartimov	2012-04-30	2	-1/+25
\|/ / /
* \| \|	Remove `button_to_function` and `link_to_function` helpers	Rafael Mendonça França	2012-04-30	1	-30/+0
* \| \|	Merge pull request #6074 from mark-rushakoff/unused-variables	Jeremy Kemper	2012-04-29	1	-1/+1
\|\ \ \
\| * \| \|	Remove unused assignment in actionpack date helper test	Mark Rushakoff	2012-04-29	1	-1/+1
* \| \| \|	Restore interpolation of path option in redirect routes	Andrew White	2012-04-29	1	-1/+32
* \| \| \|	Escape interpolated params when redirecting - fixes #5688	Andrew White	2012-04-29	1	-0/+29
* \| \| \|	Add failing test case for #6053	Andrew White	2012-04-29	1	-0/+21
* \| \| \|	Merge pull request #6059 from rafaelfranca/check_box_inverted	José Valim	2012-04-29	1	-2/+98
\|\ \ \ \
\| * \| \| \|	Change check_box to work inverting the checked and unchecked value	Rafael Mendonça França	2012-04-29	1	-2/+98
\| \|/ / /
* \| \| \|	Allow access to current object_counter variable from layout when rendering wi...	Carlos Antonio da Silva	2012-04-29	2	-4/+12
* \| \| \|	Allow layout to access current object being rendered when using render partia...	Carlos Antonio da Silva	2012-04-29	1	-0/+4
* \| \| \|	Allow layout rendering to access current object being rendered when using par...	Carlos Antonio da Silva	2012-04-29	2	-2/+7
\|/ / /
* \| /	Add changelog entry for jsonp mimetype change, fix failing test	Carlos Antonio da Silva	2012-04-29	1	-1/+1
\| \|/ \|/\|
* \|	Don't convert params if the request isn't HTML - fixes #5341	Andrew White	2012-04-29	1	-2/+40
* \|	Merge pull request #2321 from omjokine/master	José Valim	2012-04-29	1	-1/+1
\|\ \
\| * \	Merge remote-tracking branch 'upstream/master'	Olli Jokinen	2011-12-01	74	-429/+1708
\| \|\ \
\| * \| \|	fixed test case test_render_json_with_callback to use content_type applicatio...	Olli Jokinen	2011-07-28	1	-1/+1
* \| \| \|	Lazy load `default_form_builder` if it's passed as a string	Piotr Sarnacki	2012-04-28	1	-0/+17
* \| \| \|	Merge session arg with existing session instead of overwriting	Andrew White	2012-04-28	1	-0/+20
* \| \| \|	remove calls to deprecated find(:first) in actionpack test suite	Sergey Nartimov	2012-04-26	1	-2/+2
* \| \| \|	Fix the build	Yehuda Katz	2012-04-25	1	-1/+2
* \| \| \|	Merge pull request #5980 from gazay/valid_ips	Jeremy Kemper	2012-04-25	1	-20/+114
\|\ \ \ \
\| * \| \| \|	Valid ips v4 and v6. Right logic for working with X-FORWARDED-FOR header and ...	Alexey Gaziev	2012-04-25	1	-20/+114
* \| \| \| \|	Remove default match without specified method	Jose and Yehuda	2012-04-24	39	-341/+341
* \| \| \| \|	Use leap years trick in distance_of_time_in_words only for distances between ...	Alexey Vakhov	2012-04-24	1	-0/+2
* \| \| \| \|	fixed non matching documentation behaviour with method semantics on distance_...	Marcelo Casiraghi	2012-04-24	1	-2/+19