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

	Commit message (Expand)	Author	Age	Files	Lines
*	Fix #10789. Now at last ::Logger doesn't support #silence method .	kennyj	2013-06-05	2	-3/+10
*	the typecast value should be passed to the serializer. fixes #10830	Aaron Patterson	2013-06-05	2	-6/+5
*	adding a test for #10830	Aaron Patterson	2013-06-05	1	-0/+18
*	Merge pull request #10841 from latortuga/fix-underscore-dependency-tracking	David Heinemeier Hansson	2013-06-04	2	-14/+42
\|\
\| *	Fix mismatching variable names when using an underscore	Drew Ulmer	2013-06-04	2	-14/+42
* \|	Merge pull request #10839 from gsamokovarov/clean-normalize_encoded_paths	Rafael Mendonça França	2013-06-04	1	-11/+7
\|\ \
\| * \|	Refactor ActionDispatch::Http::Parameters#normalize_encode_params	Genadi Samokovarov	2013-06-04	1	-11/+7
* \| \|	Merge pull request #10838 from gsamokovarov/routing-autoload_under	Rafael Mendonça França	2013-06-04	1	-5/+7
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Dry-up ActionDispatch::Routing autoloads	Genadi Samokovarov	2013-06-04	1	-5/+7
\| \|/
* \|	Merge pull request #10832 from wangjohn/removing_use_of_application_constant	José Valim	2013-06-03	8	-50/+50
\|\ \
\| * \|	Removing use of subclassed application constant and instead using the	wangjohn	2013-06-03	8	-50/+50
\|/ /
* \|	Merge pull request #10784 from senny/10526_prevent_key_transformation	Rafael Mendonça França	2013-06-03	3	-6/+25
\|\ \
\| * \|	Prevent side effects in `Hash#with_indifferent_access`.	Yves Senn	2013-05-29	3	-6/+25
* \| \|	Replace comment about Sprockets stub directive with a link to README about al...	Guillermo Iguaran	2013-06-03	2	-2/+4
* \| \|	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
\|\ \ \ \