| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Mention about acronym inflection in config/initializers/inflections.rb | Prem Sichanugrist | 2011-07-11 | 1 | -0/+5 | |
| | |/ | | | | | | | Closes #1366 | |||||
| * / | Rails.application#env_config is now public API. [Closes #1924] | Franck Verrot | 2011-07-11 | 1 | -0/+9 | |
| |/ | ||||||
| * | Don't raise on mass assignment for test | José Valim | 2011-07-07 | 1 | -5/+0 | |
| | | ||||||
| * | Merge pull request #1767 from jwarwick/rake_notes_dirs | Santiago Pastorino | 2011-07-07 | 1 | -4/+4 | |
| |\ | | | | | Updated rake:notes to search additional directories | |||||
| | * | Updated rake:notes to search app, config, lib, script and test dirs | jwarwick | 2011-07-06 | 1 | -4/+4 | |
| | | | ||||||
| * | | Just generate AR options if AR is enabled | José Valim | 2011-07-07 | 2 | -0/+4 | |
| | | | ||||||
| * | | Merge pull request #1996 from bogdan/default_sanitizer_squashed | José Valim | 2011-07-07 | 2 | -0/+6 | |
| |\ \ | | | | | | | Rails app template: setup different mass assignment sanitizer for envs | |||||
| | * | | Rails app template: setup different mass assignment sanitizer for envs | Bogdan Gusiev | 2011-07-07 | 2 | -0/+6 | |
| | | | | | | | | | | | | | | | | For production - leave the default For test and dev: :strict. | |||||
| * | | | Merge pull request #1926 from tobsch/master | Santiago Pastorino | 2011-07-06 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | Accept application.js/.css to exist in a deeper directory depth by default | |||||
| | * | | | Now accepting css/js files in deeper directory structures by default. | Tobias Schlottke | 2011-07-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | This is useful for engines with own application.{js|css}-files. See: https://github.com/rails/rails/issues/1520 | |||||
| * | | | | updating pg supported versions docco. fixes #1959 | Aaron Patterson | 2011-07-05 | 2 | -2/+2 | |
| | | | | | ||||||
| * | | | | fix engines rake tasks | Jake Varghese | 2011-07-04 | 1 | -0/+2 | |
| | | | | | ||||||
| * | | | | Fix has_migrations? check in Rails::Engine | Sam Pohlenz | 2011-07-03 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Add assets_gemfile_entry. | José Valim | 2011-07-01 | 2 | -5/+11 | |
| |/ / / | ||||||
| * | | | Depend on edge version of sass-rails | Santiago Pastorino | 2011-06-30 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Depend on edge version of coffee-rails | Santiago Pastorino | 2011-06-30 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Master version is 3.2.0.beta | Santiago Pastorino | 2011-06-30 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Move Coffee generators and templates to Coffee Railtie and create ↵ | Santiago Pastorino | 2011-06-29 | 6 | -14/+19 | |
| | | | | | | | | | | | | | javascript_engine ("js") for apps that remove Coffee gem | |||||
| * | | | Merge pull request #1899 from ihower/patch_rake_test | José Valim | 2011-06-29 | 1 | -2/+6 | |
| |\ \ \ | | | | | | | | | Make "rake test" display not only task name but also exception message. | |||||
| | * | | | Add test to rake test for error messages | Wen-Tien Chang | 2011-06-30 | 1 | -1/+5 | |
| | | | | | ||||||
| | * | | | Make "rake test" display not only task name but also exception message. | Wen-Tien Chang | 2011-06-29 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | [IMPORTANT] Make "sprockets/railtie" require explicit. | José Valim | 2011-06-29 | 6 | -31/+13 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes "sprockets/railtie" explicit. This means that sprockets will be loaded when you require "rails/all". If you are not using requiring "rails/all", you need to manually load it with all other framework railties. In order to be complete, this commit also adds --skip-sprockets to the rails generator. | |||||
| * | | | OrderedOptions must implement respond_to? if it implements method_missing. | Chris Eppstein | 2011-06-27 | 1 | -9/+3 | |
| | | | | ||||||
| * | | | Add JavaScript Runtime name to the Rails Info properties (thanks Sam Ruby) | David Heinemeier Hansson | 2011-06-27 | 1 | -0/+4 | |
| | | | | ||||||
| * | | | Merge pull request #1481 from arunagw/lib_assets | David Heinemeier Hansson | 2011-06-27 | 1 | -0/+1 | |
| |\ \ \ | | | | | | | | | Generating /lib/assets for assets | |||||
| | * | | | Using lib/assets only. Javascripts/Stylesheets people can fill later. | Arun Agrawal | 2011-06-16 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | fixtures :all is already included in test_helper.rb | Santiago Pastorino | 2011-06-23 | 1 | -2/+0 | |
| | | | | | ||||||
| * | | | | Use non-'jdbc*' names so that db:create and db:drop work | Nick Sieger | 2011-06-21 | 3 | -9/+9 | |
| | | | | | ||||||
| * | | | | Convert database names to ones appropriate for JRuby | Nick Sieger | 2011-06-21 | 1 | -1/+12 | |
| | | | | | ||||||
| * | | | | Add generic 'jdbc' database option | Nick Sieger | 2011-06-21 | 2 | -4/+67 | |
| | | | | | ||||||
| * | | | | Remove superfluous pg driver install instructions | Nick Sieger | 2011-06-21 | 1 | -9/+0 | |
| | | | | | ||||||
| * | | | | Railties: added tests for rake assets:clean | James A. Rosen | 2011-06-21 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | rake assets:clean also removes directories | James A. Rosen | 2011-06-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/rails/rails/pull/1776#issuecomment-1402894, 2df2bfdb4b1165dce4b5bc3fe046147d793fead4, and 7440a254c4e724a5bbf6a0f4c8edb6d8d0432433. | |||||
| * | | | | Create an :assets group in the Gemfile. | José Valim | 2011-06-21 | 5 | -22/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This group is required by default only on development and test (you can change it on config/application.rb). `rake assets:precompile` will automatically add the assets group to Rails.groups (and consequently Bundler.require) and should work transparently. | |||||
| * | | | | Removed rescue branch for Rails 2.x compatibility | Alexey Gaziev | 2011-06-20 | 1 | -3/+0 | |
| | | | | | ||||||
| * | | | | Fix regexp in generators for right catching error message | Alexey Gaziev | 2011-06-20 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge pull request #1784 from gazay/3-1-stable-shadowing-variables | José Valim | 2011-06-20 | 2 | -7/+7 | |
| |\ \ \ \ | | | | | | | | | | | Removing shadowing outer local variables warnings | |||||
| | * | | | | Removed warnings about shadowing variables | Alexey Gaziev | 2011-06-20 | 2 | -7/+7 | |
| | | |_|/ | |/| | | ||||||
| * / | | | assets:clean task now cleans up images | James A. Rosen | 2011-06-19 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-18 | 1 | -1/+1 | |
| |\ \ \ | ||||||
| | * | | | fixed typo for a methodname | thoefer | 2011-06-11 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Attributes on scaffold and model generators default to string. | José Valim | 2011-06-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | This allows the following: "rails g scaffold Post title body:text author" | |||||
| * | | | | 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. | |||||
| * | | | | Make the API for compression consistent between JS and CSS. By default, ↵ | wycats | 2011-06-16 | 1 | -3/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| * | | | | | replace dev.ror.com plugin url with a dummy one | Vijay Dev | 2011-06-16 | 1 | -2/+2 | |
| | |_|_|/ |/| | | | ||||||
| * | | | | Improve the legacy wild controller route in app templates | Wen-Tien Chang | 2011-06-16 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | load_generators from engine should also handle self automatically. | José Valim | 2011-06-15 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | namespace engine assets | Ryan Bates | 2011-06-12 | 2 | -7/+21 | |
| | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |