Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #5716 from jurriaan/tr-gsub-cleanup | Santiago Pastorino | 2012-04-04 | 3 | -3/+3 | |
|\ \ \ \ | |/ / / |/| | | | Updated/changed unneeded tr/gsubs | |||||
| * | | | Updated/changed useless tr/gsubs | Jurriaan Pruis | 2012-04-03 | 3 | -3/+3 | |
| | | | | ||||||
* | | | | 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 | 1 | -4/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+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 | 2 | -5/+5 | |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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 | 1 | -7/+29 | |
| | | | ||||||
* | | | 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 | 2 | -0/+18 | |
|\ \ \ | | | | | | | | | Fix environment support for rails server, and match interface of rails console | |||||
| * | | | match rails console environment support, to server | schneems | 2012-03-22 | 1 | -0/+13 | |
| | | | | | | | | | | | | | | | | 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 | 1 | -0/+5 | |
| |/ / | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 | |
|/ / | | | | | | | rails/rails@9299bfdcd387253d83b645c205b8df477f2d0940. | |||||
* | | Rubyracer does not work on ruby, so add it to Gemfile with :ruby platform only | Piotr Sarnacki | 2012-03-17 | 1 | -1/+1 | |
| | | ||||||
* | | Rack::SSL -> ActionDispatch::SSL | Rafael Mendonça França | 2012-03-17 | 1 | -2/+1 | |
| | | ||||||
* | | Simplify helpers handling. Ensure Metal can run AC hooks. | José Valim | 2012-03-15 | 1 | -1/+1 | |
| | | ||||||
* | | Remove remaining http_only? calls. | José Valim | 2012-03-14 | 2 | -14/+4 | |
| | | ||||||
* | | Remove --http. | José Valim | 2012-03-14 | 10 | -179/+7 | |
| | | ||||||
* | | Fix scaffold controller template, ensure rake scaffold test pass by default | Carlos Antonio da Silva | 2012-03-14 | 1 | -2/+2 | |
| | | ||||||
* | | Do not generate app/views and sprockets entries on http app | Carlos Antonio da Silva | 2012-03-14 | 1 | -0/+5 | |
| | | | | | | | | [Carlos Antonio da Silva & Santiago Pastorino] | |||||
* | | Generate special controller and functional test templates for http apps | Carlos Antonio da Silva | 2012-03-14 | 7 | -4/+128 | |
| | | | | | | | | | | | | | | | | | | | | | | | | The main goal is to not generate the format.html block in scaffold controller, and to generate a different functional test as we don't rely on redirects anymore, we should test for http responses. In addition to that, the :edit action is removed from the http controller and the edit route is not generated by default, as they usually do not make sense in this scenario. [Carlos Antonio da Silva & Santiago Pastorino] | |||||
* | | Rename http-only app generator option to http | Carlos Antonio da Silva | 2012-03-14 | 3 | -5/+5 | |
| | | | | | | | | [Carlos Antonio da Silva & Santiago Pastorino] | |||||
* | | Move http only option to AppGenerator | Carlos Antonio da Silva | 2012-03-14 | 2 | -3/+3 | |
| | | | | | | | | [Carlos Antonio da Silva & Santiago Pastorino] | |||||
* | | Allow generator configs from http_only! to be overriden by app | Carlos Antonio da Silva | 2012-03-14 | 1 | -1/+1 | |
| | | | | | | | | [Carlos Antonio da Silva & Santiago Pastorino] | |||||
* | | Refactor http_only, remove reader method | Carlos Antonio da Silva | 2012-03-14 | 1 | -14/+19 | |
| | | | | | | | | [Carlos Antonio da Silva & Santiago Pastorino] | |||||
* | | Disable template, helper and assets options when using http_only! | Carlos Antonio da Silva | 2012-03-14 | 1 | -1/+14 | |
| | | | | | | | | [Carlos Antonio da Silva & Santiago Pastorino] | |||||
* | | Create generators http_only! setup and hide some common namespaces for now | Carlos Antonio da Silva | 2012-03-14 | 2 | -4/+18 | |
| | | | | | | | | [Carlos Antonio da Silva & Santiago Pastorino] | |||||
* | | Generate middleware http_only! config when running http only app generator | Carlos Antonio da Silva | 2012-03-14 | 1 | -1/+10 | |
| | | | | | | | | [Carlos Antonio da Silva & Santiago Pastorino] | |||||
* | | Add http-only option to Rails app generator | Carlos Antonio da Silva | 2012-03-14 | 3 | -5/+8 | |
| | | | | | | | | | | | | | | Change application controller template accordingly, to inherit from ActionController::HTTP and not generate protect_from_forgery call. [Carlos Antonio da Silva & Santiago Pastorino] | |||||
* | | Add ActionController::HTTP | Santiago Pastorino | 2012-03-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | More info http://edgeguides.rubyonrails.org/api_app.html [Carlos Antonio da Silva & Santiago Pastorino] |