| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | favor includes over old AR way | Vijay Dev | 2011-06-11 | 1 | -1/+1 | |
| | | | ||||||
| | * | fixed incorrect command usage. (This section needs to be updated in any case). | Vijay Dev | 2011-06-11 | 1 | -1/+1 | |
| | | | ||||||
| | * | minor fixes in action view guide | Vijay Dev | 2011-06-11 | 1 | -3/+3 | |
| | | | ||||||
| * | | Attributes on scaffold and model generators default to string. | José Valim | 2011-06-17 | 5 | -17/+24 | |
| | | | | | | | | | This allows the following: "rails g scaffold Post title body:text author" | |||||
| * | | Merge pull request #1751 from guilleiguaran/mysql-0-3-6 | Santiago Pastorino | 2011-06-17 | 2 | -2/+2 | |
| |\ \ | | | | | | | Bump to mysql2 0.3.6 | |||||
| | * | | Bump to mysql2 0.3.6 | Guillermo Iguaran | 2011-06-17 | 2 | -2/+2 | |
| |/ / | ||||||
| * | | Merge pull request #1748 from bogdan/select_form_helpers_refactor | José Valim | 2011-06-17 | 1 | -25/+10 | |
| |\ \ | | | | | | | Select tag helpers: remove some code dups | |||||
| | * | | Select tag helpers: remove some code dups | Bogdan Gusiev | 2011-06-17 | 1 | -25/+10 | |
| | | | | ||||||
| * | | | Add require 'pathname' as it has not already been required in some circumstances | Jon Leighton | 2011-06-17 | 1 | -0/+1 | |
| |/ / | ||||||
| * | | AS guide: expands safe string docs regarding destructive methods, coercion, ↵ | Xavier Noria | 2011-06-17 | 1 | -2/+20 | |
| | | | | | | | | | copying, etc. | |||||
| * | | Merge pull request #1636 from metaskills/upstream/3-1-stable | Aaron Patterson | 2011-06-17 | 1 | -0/+1 | |
| |\ \ | | | | | | | Allow the connection pool's #table_exists? method to give the connections | |||||
| | * | | Allow the connection pool's #table_exists? method to give the connections ↵ | Ken Collins | 2011-06-10 | 1 | -0/+1 | |
| | | | | | | | | | | | | | #table_exists? method a chance. | |||||
| * | | | Merge pull request #1738 from gazay/3-1-stable-change-nokogiri-version | Santiago Pastorino | 2011-06-16 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | Fix several warnings: change version of nokogiri gem | |||||
| | * | | | Change version of nokogiri gem | Alexey Gaziev | 2011-06-17 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | Merge pull request #1737 from SAP-Oxygen/master-app_plugins_ordering_patch | José Valim | 2011-06-16 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | Patch for [3.1.0.rc1] App plugins initialized before engines and plugins inside engines | |||||
| | * | | | Patch for #1458 - [3.1.0.rc1] App plugins initialized before engines | Joseph Wong | 2011-06-16 | 1 | -1/+1 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and plugins inside engines It seems that plugins inside a Rails 3.1 application proper (i.e. in /vendor/plugins) are initialized before engines and plugins inside engines. After some debugging, I found the culprit in Rails::Application::Railties#all: def all(&block) @all ||= railties + engines + super @all.each(&block) if block @all end The call to super here implicitly passes the &block argument, which has the unfortunate side-effect of adding the plugin initializers first (in front of other railties and engines) in the case of Rails::Engine#initializers: def initializers initializers = [] railties.all { |r| initializers += r.initializers } initializers += super initializers end The solution here is to replace the super call with a call to #plugins. | |||||
| * | | | Perf fix - Use an instance variable instead of a class_attribute. Thanks ↵ | Jon Leighton | 2011-06-16 | 1 | -8/+4 | |
| | | | | | | | | | | | | | @josevalim and @jhawthorn for the prompting. | |||||
| * | | | safe_concat should not work on dirty buffers. | José Valim | 2011-06-16 | 2 | -4/+20 | |
| | | | | ||||||
| * | | | Fix safe buffer by adding a dirty status. | José Valim | 2011-06-16 | 2 | -18/+55 | |
| | | | | ||||||
| * | | | 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 | |
| | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |