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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \|	rake assets:precompile executes in production environment as default if ↵	Santiago Pastorino	2011-08-15	2	-11/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RAILS_ENV was not provided
\| * \| \| \| \| \| \|	Merge pull request #2536 from arunagw/unused_var	Santiago Pastorino	2011-08-15	1	-4/+4
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unused variable removed.
\| \| * \| \| \| \| \| \|	Unused variable removed.	Arun Agrawal	2011-08-15	1	-4/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update travis config on @joshk's instructions	Jon Leighton	2011-08-15	1	-1/+2
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Document Object#public_send	Jon Leighton	2011-08-15	2	-1/+25
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add a test for delegating a method ending in '=' as this is a special case.	Jon Leighton	2011-08-15	2	-0/+9
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Ensure empty has_many :through association preloaded via joins is marked as ↵	Jon Leighton	2011-08-15	2	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	loaded. Fixes #2054.
\| * \| \| \| \| \| \|	Merge pull request #2534 from arunagw/public_send_require	Jon Leighton	2011-08-15	1	-0/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Need to include public_send
\| \| * \| \| \| \| \| \|	Need to include public_send	Arun Agrawal	2011-08-15	1	-0/+1
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Split up the definitions in Module#delegate depending on :allow_nil, and ↵	Jon Leighton	2011-08-15	2	-17/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	don't use exceptions for flow control in the :allow_nil => true case.
\| * \| \| \| \| \| \|	Fix the line number in the backtrace when Module#delegate raises	Jon Leighton	2011-08-15	2	-2/+14
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix private methods which are delegated to. This previously worked because ↵	Jon Leighton	2011-08-15	2	-13/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Module#delegate previously ignored method visibility.
\| * \| \| \| \| \| \|	Just do the method call directly in Module#delegate, if we can (we cannot ↵	Jon Leighton	2011-08-15	3	-4/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for method names ending in '='). Two reasons: 1) it's faster, see https://gist.github.com/1089783 and 2) more importantly, delegate should not allow you to accidentally call private or protected methods.
\| * \| \| \| \| \| \|	Backport Object#public_send to 1.8 so that we can implement Module#delegate ↵	Jon Leighton	2011-08-15	3	-0/+143
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	such that non-public methods raise
\| * \| \| \| \| \| \|	Ensure changing RAILS_GROUPS will load the proper dependencies.	José Valim	2011-08-14	1	-13/+16
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #2527 from cesario/fix_2511	José Valim	2011-08-14	2	-3/+8
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|	Methods like status and location are interfering with redirect_to [Closes #2511]
\| \| * \| \| \| \| \|	Methods like status and location are interfering with redirect_to [Closes #2511]	Franck Verrot	2011-08-14	2	-3/+8
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Xavier Noria	2011-08-13	24	-144/+513
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: RELEASING_RAILS.rdoc actionpack/lib/sprockets/railtie.rb actionpack/test/template/sprockets_helper_test.rb activerecord/test/cases/calculations_test.rb railties/guides/source/3_1_release_notes.textile railties/guides/source/active_resource_basics.textile railties/guides/source/command_line.textile
\| * \ \ \ \ \ \	Merge pull request #2519 from vijaydev/readme_fixes	Xavier Noria	2011-08-13	2	-3/+3
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes the README links in README.rdoc on GitHub
\| \| * \| \| \| \| \| \|	Fixes readme links better - earlier links broke when the current page is ↵	Vijay Dev	2011-08-13	2	-3/+3
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	anything other than github.com/rails/rails/. Even github.com/rails/rails (without the trailing slash) broke the readme links. Also change the rakefile that generates the rdoc readme accordingly
\| * \| \| \| \| \| \|	Perf: don't mess around with thread local vars unless we actually need to	Jon Leighton	2011-08-13	1	-18/+23
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix default scope thread safety. Thanks @thedarkone for reporting.	Jon Leighton	2011-08-13	3	-15/+53
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #2514 from myronmarston/fix_active_record_observer_disabling	José Valim	2011-08-13	4	-3/+27
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow ActiveRecord observers to be disabled.
\| \| * \| \| \| \| \| \|	Allow ActiveRecord observers to be disabled.	Myron Marston	2011-08-12	4	-3/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We have to use Observer#update rather than Observer#send since the enabled state is checked in #update before forwarding the method call on.
\| * \| \| \| \| \| \| \|	Work around for lolruby bug. (Read on for explanation.)	Jon Leighton	2011-08-13	2	-5/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We were experiencing CI test failures, for example: * 3-1-stable: http://travis-ci.org/#!/rails/rails/builds/79473/L407 * master: http://travis-ci.org/#!/rails/rails/builds/79507/L80 These failures only happened on 1.8.7-p352, and we were only able to reproduce on the Travis CI VM worker. We even tried creating a new 32 bit Ubuntu VM and running the tests on that, and it all worked fine. After some epic trial and error, we discovered that replacing the following: fuu = Marshal.load(Marshal.dump(fuu)) with: marshalled = Marshal.dump(fuu) fuu = Marshal.load(marshalled) seemed to prevent the failure. We have NO IDEA why this is. If anyone has some great insight to contribute then that is welcome. Otherwise, hopefully this will just help us get the CI green again. Many thanks to @joshk for help with sorting this out.
\| * \| \| \| \| \| \| \|	Merge pull request #2516 from arunagw/path_set_fix	Jon Leighton	2011-08-13	1	-0/+4
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|	We need [] method here. previously it's an array.
\| \| * \| \| \| \| \| \|	We need [] method here. previously it's an array.	Arun Agrawal	2011-08-13	1	-0/+4
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	moving test_generate to an integration test with one assert per test	Aaron Patterson	2011-08-12	2	-108/+183
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #2503 from arunagw/cant_dup_on_nil	Aaron Patterson	2011-08-12	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We cannot dup on nil.
\| \| * \| \| \| \| \| \|	We actually don't need a reverse_merge! here. dup removed was giving error ↵	Arun Agrawal	2011-08-12	1	-1/+1
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with nil class.
\| * \| \| \| \| \| \|	Merge pull request #2497 from akaspick/url_for_fix	Santiago Pastorino	2011-08-11	2	-1/+13
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When calling url_for with a hash, additional (likely unwanted) values (such as :host) would be returned in the hash
\| \| * \| \| \| \| \| \|	when calling url_for with a hash, additional (likely unwanted) values (such ↵	Andrew Kaspick	2011-08-11	2	-1/+13
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as :host) would be returned in the hash... calling #dup on the hash prevents this
\| * \| \| \| \| \| \|	Merge pull request #2489 from grzuy/master	Santiago Pastorino	2011-08-11	1	-4/+4
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove parameters_for_url from form_tag method header
\| \| * \| \| \| \| \| \|	Remove 'parameters_for_url' parameter from 'form_tag' method signature	Gonzalo Rodriguez and Leonardo Capillera	2011-08-10	1	-4/+4
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If you use that parameter it will end calling to url_for with two arguments, which fails because url_for expects only one
\| * \| \| \| \| \| \|	add the gem requirement for sqlite3	Aaron Patterson	2011-08-10	1	-0/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove lame comment.	José Valim	2011-08-09	1	-1/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	rake assets:precompile defaults to production env	Santiago Pastorino	2011-08-09	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	adding missing require to fist railties tests	Aaron Patterson	2011-08-09	1	-0/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Okay, the new incompatible arel is now called 2.2 and the sun shines upon ↵	Jon Leighton	2011-08-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	thee once more
\| * \| \| \| \| \| \|	Merge pull request #2465 from pivotal-casebook/patch-3	Aaron Patterson	2011-08-09	1	-0/+2
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Further monkey-patching to avoid deprecation warnings
\| \| * \| \| \| \| \| \|	Further monkey-patching to avoid deprecation warnings	Pivotal Casebook	2011-08-08	1	-0/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	deprecating process_view_paths	Aaron Patterson	2011-08-09	5	-4/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	avoid object creation via useless duping and freezing	Aaron Patterson	2011-08-09	1	-3/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	just use map and case / when rather than modifying the iterating array	Aaron Patterson	2011-08-09	1	-5/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	only typecast what we need to typecast	Aaron Patterson	2011-08-09	1	-11/+9
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Favor composition over inheritance.	Aaron Patterson	2011-08-09	1	-6/+48
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Array#+ automatically dups, no double duping	Aaron Patterson	2011-08-09	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Just remove the sort_locals method	Aaron Patterson	2011-08-09	1	-12/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	the freeze trick does nothing on arrays used as hash keys.	Aaron Patterson	2011-08-09	1	-2/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	use functional style to build a list of template objects	Aaron Patterson	2011-08-09	1	-9/+12
\| \| \| \| \| \| \| \| \|