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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #10875 from vipulnsward/fix_some_typos_in_as	Carlos Antonio da Silva	2013-06-07	2	-2/+2
\|\
\| *	Fix some typos	Vipul A M	2013-06-07	2	-2/+2
* \|	Merge pull request #10874 from rlivsey/patch-1	Andrew White	2013-06-07	1	-1/+1
\|\ \
\| * \|	Docfix: Use public interface instead of setting instance variables	Richard Livsey	2013-06-07	1	-1/+1
\|/ /
* \|	Merge pull request #10561 from Empact/nix-throwresult	Jon Leighton	2013-06-07	6	-23/+35
\|\ \
\| * \|	Rather than raising ThrowResult when construct_limited_ids_conditions comes u...	Ben Woosley	2013-05-10	3	-21/+15
\| * \|	Make NullRelation a bit more like a real relation by returning 0 for #calcula...	Ben Woosley	2013-05-10	2	-3/+8
\| * \|	No point in memoizing a simple literal string.	Ben Woosley	2013-05-10	1	-1/+1
\| * \|	Add coverage for the fact that pluck without an argument returns all the tabl...	Ben Woosley	2013-05-10	1	-0/+5
\| * \|	Fix that #pluck wasn't rescuing ThrowResult, meaning it would blow up when fa...	Ben Woosley	2013-05-10	2	-0/+8
* \| \|	Merge pull request #10871 from arunagw/lifo-to-rails	Xavier Noria	2013-06-06	3	-5/+5
\|\ \ \
\| * \| \|	As we have moved to rails/docrails from lifo/docrails	Arun Agrawal	2013-06-06	3	-5/+5
\|/ / /
* \| \|	registers recent patch in the railties CHANGELOG	Xavier Noria	2013-06-06	1	-0/+4
* \| \|	clearing autoloaded constants triggers routes reloading [Fixes #10685]	Xavier Noria	2013-06-06	2	-9/+61
* \| \|	Merge pull request #10867 from iHiD/patch-1	Xavier Noria	2013-06-06	1	-0/+2
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Add info about contributing to docs to CONTRIBUTING.md	Jeremy Walker	2013-06-06	1	-0/+2
\|/ /
* \|	Merge pull request #10851 from arunagw/fixing_build_pending_migration	Aaron Patterson	2013-06-05	1	-0/+1
\|\ \
\| * \|	Fixing build for not checking migration	Arun Agrawal	2013-06-05	1	-0/+1
\|/ /
* \|	Merge pull request #10850 from arunagw/build_fix_null_migration	Aaron Patterson	2013-06-05	1	-3/+3
\|\ \
\| * \|	Fix Build. Changing constructor.	Arun Agrawal	2013-06-05	1	-3/+3
\|/ /
* \|	Merge pull request #10482 from scudco/10432-fix-add-column-with-array	Aaron Patterson	2013-06-05	3	-0/+34
\|\ \
\| * \|	Fixes #10432 add_column not creating array columns in PostgreSQL	Adam Anderson	2013-06-04	3	-0/+34
* \| \|	only check pending migrations if there are new files	Aaron Patterson	2013-06-05	1	-2/+25
* \| \|	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
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|