aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5716 from jurriaan/tr-gsub-cleanupSantiago Pastorino2012-04-044-4/+4
|\ | | | | Updated/changed unneeded tr/gsubs
| * Updated/changed useless tr/gsubsJurriaan Pruis2012-04-034-4/+4
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-041-1/+1
|\ \ | | | | | | | | | | | | Conflicts: guides/source/engines.textile
| * | Correct invalid route example [ci skip]Cezary Baginski2012-04-021-1/+1
| | |
* | | use File.binread to pull in the schema cacheAaron Patterson2012-04-031-1/+1
| |/ |/|
* | Merge pull request #5708 from romanvbabenko/refactor/add_gem_filtersAaron Patterson2012-04-021-1/+1
|\ \ | | | | | | Unnecessary uniqueness & force mapping has been removed at BacktraceClea...
| * | Unnecessary uniqueness & force mapping has been removed at ↵Roman V. Babenko2012-04-031-1/+1
| |/ | | | | | | BacktraceCleaner#add_gem_filters
* | Usage file in generators shouldn't be fetched only based on source_rootPiotr Sarnacki2012-04-013-5/+22
| | | | | | | | | | | | | | | | In case `source_roout` is not set, `default_source_root` is used, which includes also `templates` directory. If there is no `templates` directory, `default_source_root` is not available and USAGE will not be displayed. USAGE should be also checked based on default directory excluding `templates`.
* | Merge pull request #5684 from arunagw/warning_removed_railtiesVijay Dev2012-04-011-1/+1
|\ \ | |/ |/| warning removed: `&' interpreted as argument prefix
| * warning removed: `&' interpreted as argument prefixArun Agrawal2012-03-311-1/+1
| |
* | Remove not needed requiresSantiago Pastorino2012-03-311-1/+0
|/
* use tsort_each to avoid intermediary arrayAaron Patterson2012-03-301-1/+1
|
* Define Paths::Root#[]= in terms of #add.Ben Woosley2012-03-291-2/+1
|
* Drop Paths::Root initializer check of #path as it isn't checked in the ↵Ben Woosley2012-03-292-5/+0
| | | | #path= or anywhere else
* Drop unnecessary require in Rails::PathsBen Woosley2012-03-291-2/+0
|
* clarification to prevent confusing newbies; Passenger/Unicorn are app ↵Michael de Silva2012-03-281-1/+1
| | | | servers, Apache/Nginx are the web servers along with thin a la Heroku etc.
* Merge pull request #5630 from andhapp/fix-config-asset-manifestSantiago Pastorino2012-03-281-1/+1
|\ | | | | Changed the config.assets.manifest to nil
| * Changed the config.assets.manifest to nil in the comments in the production ↵Anuj Dutta2012-03-281-1/+1
| | | | | | | | config template.
* | Rails.initialized? can be called at any time without raising an exception ↵Franck Verrot2012-03-283-5/+15
|/ | | | | | | | | | [Closes #2507] Changes: * `Rails.initialized=` has been removed * `Rails.initialized?` and `Rails.application.initialized?` are now * delegating to `MyApp::Application.initialized?`
* favor composition over inheritanceAaron Patterson2012-03-261-5/+20
|
* favor composition over inheritanceAaron Patterson2012-03-262-8/+30
|
* still need to ensure the path is a directoryAaron Patterson2012-03-261-1/+1
|
* eliminating a branch we do not need. thanks @jeremyAaron Patterson2012-03-261-30/+3
|
* stop using *args in order to simplify our constructorAaron Patterson2012-03-261-5/+4
|
* Don't depend on ivars. Thanks @fesplugasAaron Patterson2012-03-261-1/+1
|
* Remove useless conditional.Pete Higgins2012-03-251-7/+1
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-241-1/+1
|\ | | | | | | | | Conflicts: guides/source/ruby_on_rails_guides_guidelines.textile
| * Adding comma to correct syntax in comment.Jesse Brown2012-03-191-1/+1
| |
* | chdir before globbing so that we don't need to escape directory names.Aaron Patterson2012-03-231-1/+30
| | | | | | | | fixes #5521
* | Merge pull request #5550 from schneems/schneems/server_envAaron Patterson2012-03-234-0/+63
|\ \ | | | | | | Fix environment support for rails server, and match interface of rails console
| * | match rails console environment support, to serverschneems2012-03-222-0/+32
| | | | | | | | | | | | rails server takes `-e` as an argument to specify RAILS_ENV, rails console currently does not have the same interface. This commit fixes this disparity so developers can manually specify `RAILS_ENV` or can pass in an environment with a `-e`.
| * | fix rails server support of RAILS_ENV variableschneems2012-03-202-0/+31
| |/ | | | | | | | | | | | | When launching rails server from the command line with a rails environment specified such as `rails server RAILS_ENV=production` an error would occur since rails will try to use `RAILS_ENV=production` as it's server. When launching rails with a specified server such as thin `rails server thin RAILS_ENV=production` no error will be thrown, but rails will not start up in the specified environment. This fixes both of those cases
* | Fixed missing space bug introduces in ↵Anton Lindqvist2012-03-222-4/+5
| | | | | | | | rails/rails@9299bfdcd387253d83b645c205b8df477f2d0940.
* | Avoid another blank line in generated migration and remove assertion as per ↵Marcelo Silveira2012-03-211-1/+0
| | | | | | | | @spastorino request
* | Merge pull request #5532 from mhfs/migration_blank_lineJosé Valim2012-03-211-0/+1
|\ \ | | | | | | Remove blank line from generated migration
| * | Remove blank line from generated migrationMarcelo Silveira2012-03-201-0/+1
| |/
* / Generate Migration Thats Adds Removed IndexTravis Jeffery2012-03-211-0/+18
|/ | | | | When generating a migration that removes a field with an index, the down will add both the field and its index.
* Merge pull request #5492 from arunagw/build_fix_app_generator_testPiotr Sarnacki2012-03-181-1/+1
|\ | | | | Build fix for app_generator_test.rb
| * Build fix for app_generator_test.rbArun Agrawal2012-03-181-1/+1
| |
* | Merge pull request #5486 from kennyj/fix_5435Aaron Patterson2012-03-171-0/+12
|\ \ | |/ |/| Fix GH #5435. db:structure:dump should be re-enable.
| * Fix GH #5435. db:structure:dump should be reenable.kennyj2012-03-171-0/+12
| |
* | Rubyracer does not work on ruby, so add it to Gemfile with :ruby platform onlyPiotr Sarnacki2012-03-171-1/+1
| |
* | Update the guides and CHANGELOGRafael Mendonça França2012-03-171-0/+2
| |
* | Rack::SSL -> ActionDispatch::SSLRafael Mendonça França2012-03-173-6/+4
| |
* | moves the guides up to the root directoryXavier Noria2012-03-17272-40505/+1
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-175-449/+702
|\ \ | |/ |/| | | | | Conflicts: railties/guides/source/getting_started.textile
| * using pluckEgor Homakov2012-03-171-1/+1
| |
| * Moved squawk method into LocalInstanceMethods module, so it wouldMike Mulvaney2012-03-161-3/+6
| | | | | | | | | | | | | | not be added to every ActiveRecord::Base object. Changed acts_as_yaffle so it will include the LocalInstanceMethods module. Now only models that call acts_as_yaffle will get the squawk method, instead of pushing them into every ActiveRecord::Base.
| * Changed unit tests so they refer to yaffle_test_field as symbol.Mike Mulvaney2012-03-161-2/+2
| | | | | | | | | | acts_as_yaffle expects a symbol, so the string was causing the tests to always fail.
| * Add missing quotes on AS::Notifications examplesCarlos Antonio da Silva2012-03-151-12/+12
| |