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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' of github.com:rails/rails	David Heinemeier Hansson	2013-06-03	4	-20/+4
\|\
\| *	Revert "Merge pull request #4490 from EmmanuelOga/master"	José Valim	2013-06-04	3	-19/+2
\| *	Merge pull request #10809 from wangjohn/fix_failing_railtie_test	Guillermo Iguaran	2013-06-03	1	-1/+2
\| \|\
\| \| *	Fixing a failing railtie test by using the ENV variable to specify a	wangjohn	2013-05-31	1	-1/+2
* \| \|	The behavior we had in place in rc1 was actually to convert to DateTime and u...	David Heinemeier Hansson	2013-06-03	1	-2/+2
\|/ /
* \|	Allow Date to be compared with Time (like it was possible to compare Time wit...	David Heinemeier Hansson	2013-06-03	2	-0/+15
* \|	Merge pull request #10827 from trevorturk/patch-upgrade-guide	David Heinemeier Hansson	2013-06-03	1	-16/+39
\|\ \
\| * \|	Improve upgrade guide documentation about the PUT->PATCH change	Trevor Turk	2013-06-03	1	-16/+39
\|/ /
* \|	Merge pull request #10747 from javan/patch-1	David Heinemeier Hansson	2013-06-03	1	-0/+18
\|\ \
\| * \|	Add note about upgrading custom routes from `put` to `patch`.	Javan Makhmali	2013-05-24	1	-0/+18
* \| \|	Merge pull request #10825 from arunagw/remove-rake-packagetask-load	Guillermo Iguaran	2013-06-02	4	-4/+0
\|\ \ \
\| * \| \|	No need to load 'rake/packagetask' as it's already	Arun Agrawal	2013-06-02	4	-4/+0
* \| \| \|	Merge pull request #10824 from vipulnsward/wonderful	Guillermo Iguaran	2013-06-02	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	wonderfull => wonderful	Vipul A M	2013-06-02	1	-1/+1
* \| \| \|	Merge pull request #10821 from kennyj/deprecations_4_1-2	Rafael Mendonça França	2013-06-01	12	-115/+22
\|\ \ \ \
\| * \| \| \|	Remove unnecessary testcase for instance level stored_attributes.	kennyj	2013-06-02	1	-5/+0
\| * \| \| \|	Remove instance level serialized_attributes setting was deprecated.	kennyj	2013-06-02	2	-13/+0
\| * \| \| \|	Remove instance level attr_readonly setting was deprecated.	kennyj	2013-06-02	2	-12/+0
\| * \| \| \|	Remove behavior that deals with a string as third argument of `add_index`, be...	kennyj	2013-06-02	2	-38/+14
\| * \| \| \|	Raise ArgumentError to fix Rails 4.1 deprecation warn message.	kennyj	2013-06-02	2	-10/+8
\| * \| \| \|	Remove Mime::Type#verify_request? and Mime::Type.browser_generated_types were...	kennyj	2013-06-02	3	-37/+0
\|/ / / /
* \| \| \|	Merge pull request #10814 from kennyj/deprecations_4_1	Rafael Mendonça França	2013-06-01	25	-479/+4
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Remove ActionView::Template#mime_type was deprecated.	kennyj	2013-06-01	2	-13/+0
\| * \| \|	Remove #sum with a block was deprecated.	kennyj	2013-06-01	3	-21/+1
\| * \| \|	Remove ActionController::RecordIdentifier was deprecated.	kennyj	2013-06-01	5	-99/+3
\| * \| \|	Remove action_controller/vendor/html-scanner.rb was deprecated.	kennyj	2013-06-01	1	-5/+0
\| * \| \|	Remove :confirm and :disable_with options from ActionView::Helpers::FormTagHe...	kennyj	2013-06-01	2	-69/+0
\| * \| \|	Remove link_to_function / button_to_function from ActionView::Helpers::Javasc...	kennyj	2013-06-01	2	-84/+0
\| * \| \|	Remove :confirm and :disable_with options for ActionView::Helpers::UrlHelper#...	kennyj	2013-06-01	2	-93/+0
\| * \| \|	Remove active_support/testing/pending.rb was deprecated.	kennyj	2013-06-01	3	-27/+0
\| * \| \|	Remove ActiveSupport::Benchmarkable#silence was deprecated.	kennyj	2013-06-01	2	-42/+0
\| * \| \|	Remove active_support/json/variable was deprecated.	kennyj	2013-06-01	3	-26/+0
\|/ / /
* \| /	revises the documentation of ActiveRecord::Relation#find_or_create_by [ci skip]	Xavier Noria	2013-06-01	1	-14/+38
\| \|/ \|/\|
* \|	rewrites AR's reload documentation	Xavier Noria	2013-05-31	1	-4/+38
* \|	Add propery docs to ActionDispatch::Response [ci skip]	Steve Klabnik	2013-05-30	1	-3/+19
* \|	Merge pull request #10783 from wangjohn/rake_routes_additional_environment	Rafael Mendonça França	2013-05-30	1	-0/+12
\|\ \
\| * \|	Adding a test to make sure that using rake routes with the CONTROLLER	wangjohn	2013-05-29	1	-0/+12
* \| \|	Merge pull request #10805 from pilaf/master	Steve Klabnik	2013-05-30	1	-1/+1
\|\ \ \
\| * \| \|	Fix word order in documentation for with_lock	Pedro Fayolle	2013-05-30	1	-1/+1
\|/ / /
* \| \|	Merge pull request #10803 from gsamokovarov/extract-deep-munge	Rafael Mendonça França	2013-05-30	3	-18/+27
\|\ \ \
\| * \| \|	Extract ActionDispatch::Request#deep_munge	Genadi Samokovarov	2013-05-30	3	-18/+27
\| \|/ /
* \| \|	Merge pull request #10694 from steveklabnik/hsp_regression	Steve Klabnik	2013-05-30	3	-4/+17
\|\ \ \
\| * \| \|	Fix regression in has_secure_password.	Phil Calvin	2013-05-30	3	-4/+17
\|/ / /
* \| \|	Merge pull request #10785 from senny/10782_routes_inspector_deals_with_contro...	Rafael Mendonça França	2013-05-30	2	-1/+10
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	`RoutesInspector` deals with routes using regexp as `:controller` option	Yves Senn	2013-05-30	2	-1/+10
\|/ /
* \|	Merge pull request #10767 from jmondo/master	Carlos Antonio da Silva	2013-05-29	1	-1/+1
\|\ \
\| * \|	use grep over select for consistency and efficiency	John Gesimondo	2013-05-28	1	-1/+1
* \| \|	Merge pull request #10781 from arunagw/run-isolated-test	Rafael Mendonça França	2013-05-28	4	-37/+13
\|\ \ \
\| * \| \|	Running isolated tests	Arun Agrawal	2013-05-28	4	-37/+13
* \| \| \|	Merge pull request #10766 from kylerippey/minor_schema_migration_refactor	Rafael Mendonça França	2013-05-28	1	-18/+24
\|\ \ \ \