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

	Commit message (Expand)	Author	Age	Files	Lines
*	Use more appropriate one-liner for class declaration	brainopia	2012-04-30	1	-1/+1
*	Merge pull request #5838 from IamNaN/patch-1	Andrew White	2012-04-30	1	-2/+4
\|\
\| *	Correcting some confusion. Pago Pago is part of American Samoa, not Samoa. Fu...	Dave Gerton	2012-04-13	1	-2/+4
* \|	Merge pull request #6080 from carlosantoniodasilva/as-changelog-update	Xavier Noria	2012-04-30	1	-1/+1
\|\ \
\| * \|	Improve changelog of new :silence deprecation behavior	Carlos Antonio da Silva	2012-04-30	1	-1/+1
\|/ /
* \|	Merge pull request #6079 from arunagw/build_fix_master_observing_test	José Valim	2012-04-30	1	-1/+1
\|\ \
\| * \|	build fix for observing_test.rb	Arun Agrawal	2012-04-30	1	-1/+1
\|/ /
* \|	Merge pull request #6077 from dmitriy-kiriyenko/improve_signature_of_time_in_...	José Valim	2012-04-30	5	-65/+98
\|\ \
\| * \|	Replace boolean argument with an options hash.	Dmitriy Kiriyenko	2012-04-30	5	-65/+98
* \| \|	Merge pull request #5530 from malclocke/add_option_to_skip_index.html_on_rail...	José Valim	2012-04-30	3	-0/+15
\|\ \ \
\| * \| \|	Added a generator option to remove the public/index.html file when generating...	Ivan Vanderbyl	2012-03-21	3	-0/+15
* \| \| \|	Merge pull request #6078 from lest/patch-4	José Valim	2012-04-30	2	-18/+23
\|\ \ \ \
\| * \| \| \|	no need to dup options in send_data	Sergey Nartimov	2012-04-30	1	-1/+1
\| * \| \| \|	allow send_file/send_data to skip disposition header, closes #2973	Sergey Nartimov	2012-04-30	2	-17/+22
\| \| \|/ / \| \|/\| \|
* \| \| \|	Update activesupport/CHANGELOG.md	José Valim	2012-04-30	1	-0/+2
* \| \| \|	Failing test for #6034	Piotr Sarnacki	2012-04-30	1	-0/+20
* \| \| \|	Merge pull request #6034 from willbryant/flash_must_not_load_session_on_every...	Piotr Sarnacki	2012-04-30	2	-7/+3
\|\ \ \ \
\| * \| \| \|	fix the Flash middleware loading the session on every request (very dangerous...	Will Bryant	2012-04-28	2	-7/+3
* \| \| \| \|	Merge pull request #6072 from marcandre/observer_simplify_test	Santiago Pastorino	2012-04-30	1	-11/+4
\|\ \ \ \ \
\| * \| \| \| \|	Observer: simplify tests	Marc-Andre Lafortune	2012-04-29	1	-11/+4
* \| \| \| \| \|	Merge pull request #5177 from cap10morgan/fix-gh-issue-4374	José Valim	2012-04-30	2	-5/+7
\|\ \ \ \ \ \
\| * \| \| \| \| \|	fix inflector bug where -ice gets pluralized into -ouse	Wes Morgan	2012-02-25	2	-5/+7
* \| \| \| \| \| \|	Merge pull request #6076 from arunagw/build_fix_observed_classes	José Valim	2012-04-30	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Build fix for observed_classes	Arun Agrawal	2012-04-30	1	-1/+1
* \| \| \| \| \| \| \|	Merge pull request #6032 from lest/patch-2	José Valim	2012-04-30	3	-1/+41
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	wrap translate defaults to use translate helper features, closes #1102	Sergey Nartimov	2012-04-30	3	-1/+41
\|/ / / / / / /
* / / / / / /	Add note about using 303 See Other for XHR requests other than GET/POST	Andrew White	2012-04-30	1	-0/+10
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #5923 from rafaelfranca/remove_javascript_helpers	Jeremy Kemper	2012-04-29	4	-65/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove `button_to_function` and `link_to_function` helpers	Rafael Mendonça França	2012-04-30	3	-65/+2
\| * \| \| \| \| \|	Add missing require when helpers are used in isolation	Rafael Mendonça França	2012-04-30	1	-0/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #6074 from mark-rushakoff/unused-variables	Jeremy Kemper	2012-04-29	9	-15/+7
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Remove unused assignments	Mark Rushakoff	2012-04-29	4	-8/+4
\| * \| \| \| \| \|	Remove unused assignment in actionpack date helper test	Mark Rushakoff	2012-04-29	1	-1/+1
\| * \| \| \| \| \|	Remove unused assignments from activerecord tests	Mark Rushakoff	2012-04-29	4	-6/+2
* \| \| \| \| \| \|	Merge pull request #6075 from arunagw/warning_removed_unused_variable	Jeremy Kemper	2012-04-29	1	-1/+0
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	railties variable is not required here.	Arun Agrawal	2012-04-30	1	-1/+0
* \| \| \| \| \| \| \|	Merge pull request #6071 from marcandre/observer_redef	Jeremy Kemper	2012-04-29	2	-3/+14
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix Observer by acting on singleton class [#3505]	Marc-Andre Lafortune	2012-04-29	2	-3/+14
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #5942 from bcardarella/confirmation_error_message_on_confi...	Aaron Patterson	2012-04-29	7	-11/+38
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Support i18n attributes for confirmation	Brian Cardarella	2012-04-24	3	-3/+23
\| * \| \| \| \| \| \|	Reordered changelog entry	Brian Cardarella	2012-04-23	1	-2/+2
\| * \| \| \| \| \| \|	Updated CHANGELOG	Brian Cardarella	2012-04-23	1	-0/+2
\| * \| \| \| \| \| \|	confirmation validation error attribute	Brian Cardarella	2012-04-23	6	-11/+16
* \| \| \| \| \| \| \|	Merge pull request #6067 from Locke23rus/patch-2	Aaron Patterson	2012-04-29	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fix typo	Kirill Nikitin	2012-04-30	1	-1/+1
* \| \| \| \| \| \| \| \|	Merge pull request #5999 from bogdan/callbacks	Jeremy Kemper	2012-04-29	1	-7/+7
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	AS::Callbacks optimized to reduce call backtrace	Bogdan Gusiev	2012-04-27	1	-7/+7
* \| \| \| \| \| \| \| \|	Merge pull request #6036 from carlosantoniodasilva/routes-reloader-refactor	Santiago Pastorino	2012-04-29	4	-8/+4
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Refactor RoutesReloader a bit to avoid creating extra hash objects	Carlos Antonio da Silva	2012-04-28	1	-3/+2
\| * \| \| \| \| \| \| \| \|	Remove Declarative module extending, it is already part of AS::TestCase	Carlos Antonio da Silva	2012-04-28	1	-2/+0