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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \| \|	Merge pull request #7923 from josh/seperate-asset-tag-and-url-concerns	Rafael Mendonça França	2012-10-12	5	-419/+416
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Split asset url helpers into seperate AssetUrlHelper	Joshua Peek	2012-10-12	5	-419/+416
\|/ / /
* \| \|	ActiveSupport::SynchronousQueue doesn't have the drain method.	Rafael Mendonça França	2012-10-12	1	-4/+4
* \| \|	Move the TestQueue tests to the proper file	Rafael Mendonça França	2012-10-12	2	-47/+44
* \| \|	Merge pull request #7871 from bjnord/master	Rafael Mendonça França	2012-10-12	3	-8/+12
\|\ \ \
\| * \| \|	Add .rake to `rake notes` and `rake notes:custom`	Brent J. Nordquist	2012-10-12	3	-8/+12
* \| \| \|	Merge pull request #7913 from mje113/master	Xavier Noria	2012-10-12	1	-0/+4
\|\ \ \ \
\| * \| \| \|	Padding expires_in by 5 minutes on dalli key write to facilitate :race_condit...	Mike Evans	2012-10-11	1	-0/+4
* \| \| \| \|	Merge pull request #7919 from arunagw/warning_removed_shadowing	Rafael Mendonça França	2012-10-12	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	warning removed: shadowing outer local variable - value	Arun Agrawal	2012-10-12	1	-2/+2
* \| \| \| \| \|	Merge pull request #7765 from insside/clever-order	Jon Leighton	2012-10-12	3	-4/+73
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	learn ActiveRecord::QueryMethods#order work with hash arguments	Tima Maslyuchenko	2012-10-12	3	-4/+73
\|/ / / / /
* / / / /	Immediately run queued jobs in tests. Otherwise you have to explicitly drain ...	Jeremy Kemper	2012-10-12	2	-5/+5
\|/ / / /
* \| \| \|	Don't allocate new strings in compiled attribute methods	Jon Leighton	2012-10-12	2	-20/+39
* \| \| \|	Revert "Key the attributes hash with symbols"	Jon Leighton	2012-10-12	4	-14/+10
* \| \| \|	Merge pull request #7917 from dfens/master	José Valim	2012-10-12	8	-8/+8
\|\ \ \ \
\| * \| \| \|	Cleanup trailing whitespaces	dfens	2012-10-12	8	-8/+8
\|/ / / /
* \| \| \|	Merge pull request #7915 from frodsan/docs_permit	Rafael Mendonça França	2012-10-11	1	-0/+22
\|\ \ \ \
\| * \| \| \|	update AC::Parameters#permit documentation [ci skip]	Francesco Rodriguez	2012-10-11	1	-0/+22
\|/ / / /
* \| \| \|	When executing permit with just a key that points to a hash, DO NOT allow all...	Santiago Pastorino	2012-10-12	2	-2/+9
* \| \| \|	adding a test for b21f24d9807bd161af947cf0f0cc440c9adffb73	Aaron Patterson	2012-10-11	1	-0/+14
* \| \| \|	Merge pull request #7912 from mrship/master	Rafael Mendonça França	2012-10-11	4	-1/+8
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Allow for deep directory path for view templates.	Andy Shipman	2012-10-11	4	-1/+8
\|/ / /
* \| \|	Merge pull request #7886 from senny/3675_assert_template_twice_against_same_p...	Rafael Mendonça França	2012-10-11	5	-13/+50
\|\ \ \
\| * \| \|	refactor `ActionView::TestCase` internals to track rendered locals	Yves Senn	2012-10-11	2	-20/+33
\| * \| \|	recognizes when a partial was rendered twice. Closes #3675	Yves Senn	2012-10-11	5	-9/+33
* \| \| \|	Merge pull request #7908 from arunagw/build_fix_railties	Rafael Mendonça França	2012-10-11	1	-5/+0
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	No need to test for rack-cache present in Gemfile	Arun Agrawal	2012-10-11	1	-5/+0
\|/ / /
* \| \|	Merge pull request #7050 from kytrinyx/documentation-reset-column-info	Vijay Dev	2012-10-10	1	-0/+21
\|\ \ \
\| * \| \|	Expand caveat about models in migrations (rails guide)	Katrina Owen	2012-10-10	1	-0/+21
* \| \| \|	Merge pull request #7904 from jfirebaugh/eager_autoload	Rafael Mendonça França	2012-10-10	1	-10/+14
\|\ \ \ \
\| * \| \| \|	Eager autoload Preloader classes	John Firebaugh	2012-10-10	1	-10/+14
\|/ / / /
* \| \| \|	Remove the leading :: constant qualifier in the ActiveRecord::Fixtures deprec...	Jeremy Kemper	2012-10-10	1	-1/+1
* \| \| \|	Upgrade to a jquery-rails that doesn't expect config.action_view.javascript_e...	Jeremy Kemper	2012-10-10	1	-1/+1
\|/ / /
* \| \|	Merge pull request #7887 from senny/remove_unused_requires_in_ar_tests	Vijay Dev	2012-10-10	4	-4/+0
\|\ \ \
\| * \| \|	remove duplicated require statements in AR test cases	Yves Senn	2012-10-09	4	-4/+0
* \| \| \|	Fixing build failures	Vijay Dev	2012-10-11	6	-14/+14
* \| \| \|	Merge pull request #7898 from olivierlacan/pg_homebrew_instructions	Vijay Dev	2012-10-10	1	-1/+3
\|\ \ \ \
\| * \| \| \|	Offer instructions for pg gem when installed via Homebrew	Olivier Lacan	2012-10-10	1	-1/+3
* \| \| \| \|	Merge pull request #7890 from AvnerCohen/new_hash_syntax	Vijay Dev	2012-10-10	1	-9/+9
\|\ \ \ \ \
\| * \| \| \| \|	moving to new hash syntax, for discussion before I take the time on full folders	AvnerCohen	2012-10-09	1	-9/+9
* \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-10-11	65	-252/+336
\|\ \ \ \ \ \
\| * \| \| \| \| \|	copy edits [ci skip]	Vijay Dev	2012-10-11	2	-4/+4
\| * \| \| \| \| \|	copy-edit the email delivery errors comment	Vijay Dev	2012-10-11	1	-1/+1
\| * \| \| \| \| \|	Revert "Fix Example in active model attribute methods"	Vijay Dev	2012-10-11	1	-1/+1
\| * \| \| \| \| \|	Revert "Fix all examples in comments in active_model attribute methods"	Vijay Dev	2012-10-11	1	-6/+6
\| * \| \| \| \| \|	Added clarity to update_column(s)	Adam Haymond	2012-10-10	1	-2/+2
\| * \| \| \| \| \|	migrating guides to new hash syntax	AvnerCohen	2012-10-10	3	-68/+68
\| * \| \| \| \| \|	Use a 1.9 Hash syntax in README files (fixes thanks to @vijaydev)	Robin Dupret	2012-10-10	2	-9/+9
\| * \| \| \| \| \|	Revert "Add changelog/release note entries for missing ActionMailer super fea...	Aditya Sanghi	2012-10-10	2	-5/+0