aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Perf fix - Use an instance variable instead of a class_attribute. Thanks ↵Jon Leighton2011-06-161-8/+4
| | | | @josevalim and @jhawthorn for the prompting.
* safe_concat should not work on dirty buffers.José Valim2011-06-162-4/+20
|
* Fix safe buffer by adding a dirty status.José Valim2011-06-162-18/+55
|
* Make the API for compression consistent between JS and CSS. By default, ↵wycats2011-06-162-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_patchJosé Valim2011-06-162-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/1460Joseph Wong2011-06-162-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_changeXavier Noria2011-06-161-2/+2
|\ \ | | | | | | Replace dev.rubyonrails.com plugin url with a dummy url
| * | replace dev.ror.com plugin url with a dummy oneVijay Dev2011-06-161-2/+2
|/ /
* | Use html_safeSantiago Pastorino2011-06-161-2/+2
| |
* | Remove usage of memoizable from ActionPack.José Valim2011-06-162-10/+9
| |
* | Update CHANGELOG, improve message.José Valim2011-06-162-2/+4
| |
* | Merge pull request #1727 from ihower/improve_legacy_wild_controller_routeJosé Valim2011-06-162-2/+2
|\ \ | | | | | | Improve the legacy wild controller route in app templates
| * | Also change the default route commentWen-Tien Chang2011-06-161-1/+1
| | |
| * | Improve the legacy wild controller route in app templatesWen-Tien Chang2011-06-161-1/+1
| | |
* | | Merge pull request #1725 from arunagw/mysql_bumpJosé Valim2011-06-162-2/+2
|\ \ \ | |/ / |/| | Bump mysql2 to 0.3.5
| * | Bump mysql2 to 0.3.5Arun Agrawal2011-06-162-2/+2
|/ /
* / Bump mysql2 upSantiago Pastorino and José Ignacio Costa2011-06-162-2/+2
|/
* Deprecate memoizable.José Valim2011-06-153-7/+28
|
* load_generators from engine should also handle self automatically.José Valim2011-06-151-3/+3
|
* Merge pull request #1711 from daeltar/masterJosé Valim2011-06-151-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-151-1/+1
|/
* Merge pull request #1707 from dmathieu/memoizeJosé Valim2011-06-152-1/+19
|\ | | | | Allow last argument to be a boolean in memoized methods
| * allow boolean last argument in memoized methods - Closes #1704Damien Mathieu2011-06-151-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 trueBrian Underwood2011-06-151-0/+14
| | | | | | | | Signed-off-by: Damien Mathieu <42@dmathieu.com>
* | simplify to only one conditionDamien Mathieu2011-06-151-5/+1
|/ | | | Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
* Make MissingTranslation exception handler respect :rescue_formatAndrew White2011-06-152-1/+13
|
* Fix appending sprockets pathsJoshua Peek2011-06-141-1/+6
|
* Merge pull request #1698 from bagwanpankaj/masterJon Leighton2011-06-141-1/+1
|\ | | | | Removed warnings from while running tests in Ruby 1.9.2
| * Removed warning while running test with ruby 1.9.2bagwanpankaj2011-06-141-1/+1
|/
* Merge pull request #1689 from dmathieu/utf8-filenameJosé Valim2011-06-142-1/+18
|\ | | | | Encode the uploaded file's name in utf8 - Closes #869
| * all requests are utf-8. Don't use the external encoding.Damien Mathieu2011-06-142-9/+3
| |
| * encode the uploaded file's name in the default external encoding - Closes #869Damien Mathieu2011-06-142-1/+24
|/
* Add Gemfile dependency for require_relative on mri18. This is a dependency ↵Jon Leighton2011-06-131-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 moduleAndrew White2011-06-131-11/+0
|
* Rename Time#whole_* to Time#all_* [thanks Pratik!]David Heinemeier Hansson2011-06-133-16/+16
|
* Added Time#whole_day/week/quarter/year as a way of generating ranges ↵David Heinemeier Hansson2011-06-133-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 Hansson2011-06-133-4/+14
| | | | friends [DHH]
* Merge pull request #1676 from neerajdotname/make_test_name_meaningfulSantiago Pastorino2011-06-131-1/+1
|\ | | | | Remove "is_assed" with something more meaningful
| * Remove "is_assed" with something more meaningfulNeeraj Singh2011-06-131-1/+1
| |
* | Merge pull request #1654 from ganeshkumar/test_casesSantiago Pastorino2011-06-131-1/+0
|\ \ | | | | | | removed duplicate code in tests
| * | removed duplicate codeganesh2011-06-111-1/+0
| | |
* | | Pass mass-assignment options to nested models - closes #1673.Andrew White2011-06-134-18/+276
| | |
* | | Rename tests to reflect associationsAndrew White2011-06-131-30/+30
| | |
* | | Merge pull request #1672 from ryanb/namespace_engine_assetsJosé Valim2011-06-133-19/+37
|\ \ \ | |_|/ |/| | Namespace engine assets
| * | namespace engine assetsRyan Bates2011-06-123-19/+37
|/ /
* | Add support for using an ARCONFIG environment variable to specify the ↵Jon Leighton2011-06-122-4/+12
| | | | | | | | location of the config.yml file for running the tests
* | Oops, this should have been in the last commit :zap:Jon Leighton2011-06-121-1/+1
| |
* | Make assert_no_queries literally enforce that there are no queries. As in, ↵Jon Leighton2011-06-122-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 itJon Leighton2011-06-122-10/+10
| |
* | Replace inline lambdas with named methodsJon Leighton2011-06-121-29/+42
| |