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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \|	Make the API for compression consistent between JS and CSS. By default, ↵	wycats	2011-06-16	2	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	users just need to say whether they want compression or not, and a default will be chosen by a Railtie. In the case of CSS, this default is already chosen by the sass-rails gem. Users can still explicitly choose a compressor in their application.rb if they have a preference, but will usually want to let plugins choose defaults in their Railties.
* \| \| \| \| \|	Merge pull request #1733 from SAP-Oxygen/master-plugins_in_engine_patch	José Valim	2011-06-16	2	-8/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cherry-picking patch for https://github.com/rails/rails/issues/1460 from 3-1-stable to master
\| * \| \| \| \| \|	Cherry-picking patch for https://github.com/rails/rails/issues/1460	Joseph Wong	2011-06-16	2	-8/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	from 3-1-stable to master [3.1.0.rc1] Plugins inside engines not eager-loaded properly and their rake tasks ignored Working with the new support for plugins inside engines in Rails 3.1, I found that certain things that work for regular plugins don't work for these new nested plugins. In particular, these methods in Rails::Engine don't seem to understand that an engine could have nested plugins: #load_tasks #load_generators #load_console #eager_load! A solution which worked out for me is to move the calls to railties.all { ... } from the overriding methods in Rails::Application into Rails::Engine.
* \| \| \| \| \| \|	Merge pull request #1731 from vijaydev/plugin_name_change	Xavier Noria	2011-06-16	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace dev.rubyonrails.com plugin url with a dummy url
\| * \| \| \| \| \| \|	replace dev.ror.com plugin url with a dummy one	Vijay Dev	2011-06-16	1	-2/+2
\|/ / / / / / /
* \| \| \| \| \| \|	Use html_safe	Santiago Pastorino	2011-06-16	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Remove usage of memoizable from ActionPack.	José Valim	2011-06-16	2	-10/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Update CHANGELOG, improve message.	José Valim	2011-06-16	2	-2/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #1727 from ihower/improve_legacy_wild_controller_route	José Valim	2011-06-16	2	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve the legacy wild controller route in app templates
\| * \| \| \| \| \| \|	Also change the default route comment	Wen-Tien Chang	2011-06-16	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Improve the legacy wild controller route in app templates	Wen-Tien Chang	2011-06-16	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #1725 from arunagw/mysql_bump	José Valim	2011-06-16	2	-2/+2
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Bump mysql2 to 0.3.5
\| * \| \| \| \| \| \|	Bump mysql2 to 0.3.5	Arun Agrawal	2011-06-16	2	-2/+2
\|/ / / / / / /
* / / / / / /	Bump mysql2 up	Santiago Pastorino and José Ignacio Costa	2011-06-16	2	-2/+2
\|/ / / / / /
* \| \| \| \| \|	Deprecate memoizable.	José Valim	2011-06-15	3	-7/+28
\| \| \| \| \| \|
* \| \| \| \| \|	load_generators from engine should also handle self automatically.	José Valim	2011-06-15	1	-3/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #1711 from daeltar/master	José Valim	2011-06-15	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use assert_equal instead of assert in uploaded file test.
\| * \| \| \| \| \|	Use assert_equal instead of assert in uploaded file test.	Lukáš Konarovský	2011-06-15	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #1707 from dmathieu/memoize	José Valim	2011-06-15	2	-1/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow last argument to be a boolean in memoized methods
\| * \| \| \| \| \|	allow boolean last argument in memoized methods - Closes #1704	Damien Mathieu	2011-06-15	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If in the memoized method, the last argument is a boolean, it's considered as the reload method. Don't consider it like that if that's a normal method argument.
\| * \| \| \| \| \|	Failing test to show problem when last argument of a memoized method is true	Brian Underwood	2011-06-15	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Damien Mathieu <42@dmathieu.com>
* \| \| \| \| \| \|	simplify to only one condition	Damien Mathieu	2011-06-15	1	-5/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
* \| \| \| \| \|	Make MissingTranslation exception handler respect :rescue_format	Andrew White	2011-06-15	2	-1/+13
\| \| \| \| \| \|
* \| \| \| \| \|	Fix appending sprockets paths	Joshua Peek	2011-06-14	1	-1/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #1698 from bagwanpankaj/master	Jon Leighton	2011-06-14	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed warnings from while running tests in Ruby 1.9.2
\| * \| \| \| \| \|	Removed warning while running test with ruby 1.9.2	bagwanpankaj	2011-06-14	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #1689 from dmathieu/utf8-filename	José Valim	2011-06-14	2	-1/+18
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|	Encode the uploaded file's name in utf8 - Closes #869
\| * \| \| \| \|	all requests are utf-8. Don't use the external encoding.	Damien Mathieu	2011-06-14	2	-9/+3
\| \| \| \| \| \|
\| * \| \| \| \|	encode the uploaded file's name in the default external encoding - Closes #869	Damien Mathieu	2011-06-14	2	-1/+24
\|/ / / / /
* \| \| \| \|	Add Gemfile dependency for require_relative on mri18. This is a dependency ↵	Jon Leighton	2011-06-13	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	of linecache which is a dependency of ruby-debug. However, the latest release of linecache (0.45) omits the dependency from its gemspec, causing the build to fail. I have emailed the maintainer so we should remove this when it's fixed upstream.
* \| \| \| \|	Remove obsolete compatibility module	Andrew White	2011-06-13	1	-11/+0
\| \| \| \| \|
* \| \| \| \|	Rename Time#whole_* to Time#all_* [thanks Pratik!]	David Heinemeier Hansson	2011-06-13	3	-16/+16
\| \| \| \| \|
* \| \| \| \|	Added Time#whole_day/week/quarter/year as a way of generating ranges ↵	David Heinemeier Hansson	2011-06-13	3	-1/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(example: Event.where(created_at: Time.now.whole_week)) [DHH]
* \| \| \| \|	Added instance_accessor: false as an option to Class#cattr_accessor and ↵	David Heinemeier Hansson	2011-06-13	3	-4/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	friends [DHH]
* \| \| \| \|	Merge pull request #1676 from neerajdotname/make_test_name_meaningful	Santiago Pastorino	2011-06-13	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove "is_assed" with something more meaningful
\| * \| \| \| \|	Remove "is_assed" with something more meaningful	Neeraj Singh	2011-06-13	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #1654 from ganeshkumar/test_cases	Santiago Pastorino	2011-06-13	1	-1/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removed duplicate code in tests
\| * \| \| \| \| \|	removed duplicate code	ganesh	2011-06-11	1	-1/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Pass mass-assignment options to nested models - closes #1673.	Andrew White	2011-06-13	4	-18/+276
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Rename tests to reflect associations	Andrew White	2011-06-13	1	-30/+30
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #1672 from ryanb/namespace_engine_assets	José Valim	2011-06-13	3	-19/+37
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	Namespace engine assets
\| * \| \| \| \| \|	namespace engine assets	Ryan Bates	2011-06-12	3	-19/+37
\|/ / / / / /
* \| \| \| \| \|	Add support for using an ARCONFIG environment variable to specify the ↵	Jon Leighton	2011-06-12	2	-4/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	location of the config.yml file for running the tests
* \| \| \| \| \|	Oops, this should have been in the last commit :zap:	Jon Leighton	2011-06-12	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Make assert_no_queries literally enforce that there are no queries. As in, ↵	Jon Leighton	2011-06-12	2	-15/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	not a single line of SQL should be sent to the database, not even stuff that is ignored by assert_queries. The argument being that if you write assert_no_queries, you really do not want there to be any queries.
* \| \| \| \| \|	If we're going to use a global variable, let's at least namespace it	Jon Leighton	2011-06-12	2	-10/+10
\| \| \| \| \| \|
* \| \| \| \| \|	Replace inline lambdas with named methods	Jon Leighton	2011-06-12	1	-29/+42
\| \| \| \| \| \|
* \| \| \| \| \|	Refactor tests to be less brittle	Jon Leighton	2011-06-12	3	-28/+74
\| \| \| \| \| \|
* \| \| \| \| \|	Move BEGIN and COMMIT into IGNORED_SQL rather than having them as a special ↵	Jon Leighton	2011-06-12	2	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	case in assert_queries
* \| \| \| \| \|	Don't wrap operations on collection associations in transactions when they ↵	benedikt	2011-06-12	2	-3/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	are not needed, so the connection adapter does not send empty BEGIN COMMIT transactions blocks to the database.