Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-04 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: guides/source/engines.textile | ||||
| * | Correct invalid route example [ci skip] | Cezary Baginski | 2012-04-02 | 1 | -1/+1 |
| | | |||||
* | | use File.binread to pull in the schema cache | Aaron Patterson | 2012-04-03 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #5708 from romanvbabenko/refactor/add_gem_filters | Aaron Patterson | 2012-04-02 | 1 | -1/+1 |
|\ \ | | | | | | | Unnecessary uniqueness & force mapping has been removed at BacktraceClea... | ||||
| * | | Unnecessary uniqueness & force mapping has been removed at ↵ | Roman V. Babenko | 2012-04-03 | 1 | -1/+1 |
| |/ | | | | | | | BacktraceCleaner#add_gem_filters | ||||
* | | Usage file in generators shouldn't be fetched only based on source_root | Piotr Sarnacki | 2012-04-01 | 3 | -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_railties | Vijay Dev | 2012-04-01 | 1 | -1/+1 |
|\ \ | |/ |/| | warning removed: `&' interpreted as argument prefix | ||||
| * | warning removed: `&' interpreted as argument prefix | Arun Agrawal | 2012-03-31 | 1 | -1/+1 |
| | | |||||
* | | Remove not needed requires | Santiago Pastorino | 2012-03-31 | 1 | -1/+0 |
|/ | |||||
* | use tsort_each to avoid intermediary array | Aaron Patterson | 2012-03-30 | 1 | -1/+1 |
| | |||||
* | Define Paths::Root#[]= in terms of #add. | Ben Woosley | 2012-03-29 | 1 | -2/+1 |
| | |||||
* | Drop Paths::Root initializer check of #path as it isn't checked in the ↵ | Ben Woosley | 2012-03-29 | 2 | -5/+0 |
| | | | | #path= or anywhere else | ||||
* | Drop unnecessary require in Rails::Paths | Ben Woosley | 2012-03-29 | 1 | -2/+0 |
| | |||||
* | clarification to prevent confusing newbies; Passenger/Unicorn are app ↵ | Michael de Silva | 2012-03-28 | 1 | -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-manifest | Santiago Pastorino | 2012-03-28 | 1 | -1/+1 |
|\ | | | | | Changed the config.assets.manifest to nil | ||||
| * | Changed the config.assets.manifest to nil in the comments in the production ↵ | Anuj Dutta | 2012-03-28 | 1 | -1/+1 |
| | | | | | | | | config template. | ||||
* | | Rails.initialized? can be called at any time without raising an exception ↵ | Franck Verrot | 2012-03-28 | 3 | -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 inheritance | Aaron Patterson | 2012-03-26 | 1 | -5/+20 |
| | |||||
* | favor composition over inheritance | Aaron Patterson | 2012-03-26 | 2 | -8/+30 |
| | |||||
* | still need to ensure the path is a directory | Aaron Patterson | 2012-03-26 | 1 | -1/+1 |
| | |||||
* | eliminating a branch we do not need. thanks @jeremy | Aaron Patterson | 2012-03-26 | 1 | -30/+3 |
| | |||||
* | stop using *args in order to simplify our constructor | Aaron Patterson | 2012-03-26 | 1 | -5/+4 |
| | |||||
* | Don't depend on ivars. Thanks @fesplugas | Aaron Patterson | 2012-03-26 | 1 | -1/+1 |
| | |||||
* | Remove useless conditional. | Pete Higgins | 2012-03-25 | 1 | -7/+1 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-24 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: guides/source/ruby_on_rails_guides_guidelines.textile | ||||
| * | Adding comma to correct syntax in comment. | Jesse Brown | 2012-03-19 | 1 | -1/+1 |
| | | |||||
* | | chdir before globbing so that we don't need to escape directory names. | Aaron Patterson | 2012-03-23 | 1 | -1/+30 |
| | | | | | | | | fixes #5521 | ||||
* | | Merge pull request #5550 from schneems/schneems/server_env | Aaron Patterson | 2012-03-23 | 4 | -0/+63 |
|\ \ | | | | | | | Fix environment support for rails server, and match interface of rails console | ||||
| * | | match rails console environment support, to server | schneems | 2012-03-22 | 2 | -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 variable | schneems | 2012-03-20 | 2 | -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 Lindqvist | 2012-03-22 | 2 | -4/+5 |
| | | | | | | | | rails/rails@9299bfdcd387253d83b645c205b8df477f2d0940. | ||||
* | | Avoid another blank line in generated migration and remove assertion as per ↵ | Marcelo Silveira | 2012-03-21 | 1 | -1/+0 |
| | | | | | | | | @spastorino request | ||||
* | | Merge pull request #5532 from mhfs/migration_blank_line | José Valim | 2012-03-21 | 1 | -0/+1 |
|\ \ | | | | | | | Remove blank line from generated migration | ||||
| * | | Remove blank line from generated migration | Marcelo Silveira | 2012-03-20 | 1 | -0/+1 |
| |/ | |||||
* / | Generate Migration Thats Adds Removed Index | Travis Jeffery | 2012-03-21 | 1 | -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_test | Piotr Sarnacki | 2012-03-18 | 1 | -1/+1 |
|\ | | | | | Build fix for app_generator_test.rb | ||||
| * | Build fix for app_generator_test.rb | Arun Agrawal | 2012-03-18 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #5486 from kennyj/fix_5435 | Aaron Patterson | 2012-03-17 | 1 | -0/+12 |
|\ \ | |/ |/| | Fix GH #5435. db:structure:dump should be re-enable. | ||||
| * | Fix GH #5435. db:structure:dump should be reenable. | kennyj | 2012-03-17 | 1 | -0/+12 |
| | | |||||
* | | Rubyracer does not work on ruby, so add it to Gemfile with :ruby platform only | Piotr Sarnacki | 2012-03-17 | 1 | -1/+1 |
| | | |||||
* | | Update the guides and CHANGELOG | Rafael Mendonça França | 2012-03-17 | 1 | -0/+2 |
| | | |||||
* | | Rack::SSL -> ActionDispatch::SSL | Rafael Mendonça França | 2012-03-17 | 3 | -6/+4 |
| | | |||||
* | | moves the guides up to the root directory | Xavier Noria | 2012-03-17 | 272 | -40505/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-17 | 5 | -449/+702 |
|\ \ | |/ |/| | | | | | Conflicts: railties/guides/source/getting_started.textile | ||||
| * | using pluck | Egor Homakov | 2012-03-17 | 1 | -1/+1 |
| | | |||||
| * | Moved squawk method into LocalInstanceMethods module, so it would | Mike Mulvaney | 2012-03-16 | 1 | -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 Mulvaney | 2012-03-16 | 1 | -2/+2 |
| | | | | | | | | | | acts_as_yaffle expects a symbol, so the string was causing the tests to always fail. | ||||
| * | Add missing quotes on AS::Notifications examples | Carlos Antonio da Silva | 2012-03-15 | 1 | -12/+12 |
| | | |||||
| * | [ci skip] Add examples of subscribing & creating ActiveSupport::Notifications | adman65 | 2012-03-15 | 1 | -1/+73 |
| | | |||||
| * | [ci skip] Add examples to instrumentation guide | adman65 | 2012-03-15 | 1 | -42/+322 |
| | |