aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* rake assets:clean also removes directoriesJames A. Rosen2011-06-211-1/+1
| | | | | | See https://github.com/rails/rails/pull/1776#issuecomment-1402894, 2df2bfdb4b1165dce4b5bc3fe046147d793fead4, and 7440a254c4e724a5bbf6a0f4c8edb6d8d0432433.
* Create an :assets group in the Gemfile.José Valim2011-06-215-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 compatibilityAlexey Gaziev2011-06-201-3/+0
|
* Fix regexp in generators for right catching error messageAlexey Gaziev2011-06-201-1/+1
|
* Merge pull request #1784 from gazay/3-1-stable-shadowing-variablesJosé Valim2011-06-202-7/+7
|\ | | | | Removing shadowing outer local variables warnings
| * Removed warnings about shadowing variablesAlexey Gaziev2011-06-202-7/+7
| |
* | assets:clean task now cleans up imagesJames A. Rosen2011-06-191-1/+1
|/
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-181-1/+1
|\
| * fixed typo for a methodnamethoefer2011-06-111-1/+1
| |
* | Attributes on scaffold and model generators default to string.José Valim2011-06-171-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 enginesJoseph Wong2011-06-161-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, ↵wycats2011-06-161-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_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.
* | | replace dev.ror.com plugin url with a dummy oneVijay Dev2011-06-161-2/+2
| | |
* | | Improve the legacy wild controller route in app templatesWen-Tien Chang2011-06-161-1/+1
|/ /
* | load_generators from engine should also handle self automatically.José Valim2011-06-151-3/+3
| |
* | namespace engine assetsRyan Bates2011-06-122-7/+21
| |
* | s/Bundle/Bundler/Xavier Noria2011-06-111-1/+1
|/
* shell out to run bundler on app generation, see rationale in the commentXavier Noria2011-06-101-6/+12
|
* make 'rails runner' show usage when run without any optionsVijay Dev2011-06-101-0/+4
|
* Merge pull request #1356 from flippingbits/fix_engine_generatorJosé Valim2011-06-0910-23/+69
|\ | | | | Fix engine's generator
| * Use mattr_accessor :namespaceStefan Sprenger2011-06-071-10/+2
| |
| * Use namespace if it's a mountable engineStefan Sprenger2011-06-074-3/+17
| |
| * We moved engine commands to rails/engine/commandsStefan Sprenger2011-05-271-5/+1
| |
| * Add destroy to engine's commandsStefan Sprenger2011-05-271-2/+3
| |
| * Generate script/rails only if --full is givenStefan Sprenger2011-05-271-0/+2
| |
| * Refactor identifying generator's destination rootStefan Sprenger2011-05-271-5/+2
| |
| * Move requiring engine out of the switch caseStefan Sprenger2011-05-271-4/+3
| |
| * Fix and test ENGINE_PATH and ENGINE_ROOTStefan Sprenger2011-05-271-2/+2
| |
| * Introducing engine commandsStefan Sprenger2011-05-263-3/+48
| |
| * Move load_generators from Rails::Application to Rails::EngineStefan Sprenger2011-05-262-12/+12
| |
* | sprockets gzips assets nowXavier Noria2011-06-071-1/+4
| |
* | Fixing Rails::Server#app under Rack::URLMapGuillermo Iguaran2011-06-072-1/+5
| |
* | adds missing requireXavier Noria2011-06-071-0/+2
| |
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-067-12/+12
|\ \ | | | | | | | | | | | | Conflicts: activerecord/RUNNING_UNIT_TESTS
| * | Remove trailing white-spacesGuillermo Iguaran2011-06-055-9/+9
| | |
| * | fix incorrect module name for wrap parametersVijay Dev2011-06-041-1/+1
| | |
| * | Upcoming version of Rails is upon us so no need to refer to it. [API DOCS]Rohit Arondekar2011-06-031-2/+2
| | |
| * | add alias info for runner commandVijay Dev2011-06-021-1/+1
| | |
* | | revises commit from pull request 1408Xavier Noria2011-05-311-4/+7
| | |
* | | revises commit from pull request 1409Xavier Noria2011-05-311-4/+8
| | |
* | | Modified generated text to explain where .js and .coffee files can be ↵Noel Gomez2011-05-311-3/+5
| | | | | | | | | | | | located and that there shouldn't be blank lines in manifest per this issue http://groups.google.com/group/rubyonrails-talk/browse_thread/thread/effb868290c2c0b8
* | | changed text to be more explicit about where stylesheets can be locatedNoel Gomez2011-05-311-2/+5
| | |
* | | Merge pull request #1404 from ↵José Valim2011-05-302-1/+5
|\ \ \ | | | | | | | | | | | | | | | | commuter/plugin_new_generator_should_properly_require_js properly require javascript libraries when generating mountable engine
| * | | properly require javascript libraries when generating mountable engineJ. Edward Dewyea2011-05-302-1/+5
| | |/ | |/|
* | | refectored assets:clean taskVishnu Atrai2011-05-301-3/+1
| | |
* | | rename task and Rake::FileList used Vishnu Atrai2011-05-271-3/+3
| | |
* | | Add rake task to implement assets:cleanup, fixes Github Issues # 1284Bhavin Kamani2011-05-271-0/+10
|/ /
* | Use global namespace RailsStefan Sprenger2011-05-261-1/+1
| |