aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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
* | Patch for #1458 - [3.1.0.rc1] App plugins initialized before enginesJoseph Wong2011-06-161-1/+1
* | Make the API for compression consistent between JS and CSS. By default, user...wycats2011-06-161-3/+0
* | 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/1460Joseph Wong2011-06-162-8/+10
* | | 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
|\
| * 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
|\ \
| * | 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 located...Noel Gomez2011-05-311-3/+5
* | | changed text to be more explicit about where stylesheets can be locatedNoel Gomez2011-05-311-2/+5
* | | Merge pull request #1404 from commuter/plugin_new_generator_should_properly_r...José Valim2011-05-302-1/+5
|\ \ \
| * | | 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
* | Use plugin name consistentlyStefan Sprenger2011-05-261-1/+1
* | Added a space to the comment_if helper for formatting purposesAndrew Davis2011-05-251-1/+1