Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-03-15 | 2 | -3/+9 |
|\ | |||||
| * | In app_generator, fix hardcoded `bundle` call to derive the bundle ↵ | Caio Chassot | 2010-03-12 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | executable name from Thor::Util.ruby_command. This ensures that eg. when `rails` is called from `ruby1.9`, `bundle1.9` is called. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Add a check to ensure that the application name does not already exist, i.e. ↵ | Kieran Pilkington | 2010-03-12 | 1 | -0/+2 |
| | | | | | | | | | | | | String or Module are part of ruby [#3872 status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Revert "Always load the environment before executing any command. [#3905 ↵ | José Valim | 2010-03-12 | 1 | -2/+5 |
| | | | | | | | | | | | | status:resolved]" This reverts commit 16846553b8866eab2aa3b128a2a23a221a25f7e3. | ||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-03-12 | 9 | -49/+44 |
|\| | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb railties/lib/rails/configuration.rb railties/lib/rails/log_subscriber.rb | ||||
| * | Always load the environment before executing any command. [#3905 ↵ | José Valim | 2010-03-12 | 1 | -5/+2 |
| | | | | | | | | status:resolved] | ||||
| * | Added alert to layouts on scaffold. | José Valim | 2010-03-09 | 1 | -0/+4 |
| | | |||||
| * | Update generated Gemfile to use http://rubygems.org, unicorn instead of ↵ | Jeremy Kemper | 2010-03-07 | 1 | -4/+4 |
| | | | | | | | | mongrel, and nokogiri instead of hpricot | ||||
| * | Change generated code to replace faulty comment | Carlhuda | 2010-03-04 | 1 | -1/+1 |
| | | |||||
| * | Deprecated ActionController::Base.session_options= and ↵ | Carlhuda | 2010-03-04 | 2 | -8/+3 |
| | | | | | | | | ActionController::Base.session_store= in favor of a config.session_store method (which takes params) and a config.cookie_secret variable, which is used in various secret scenarios. The old AC::Base options will continue to work with deprecation warnings. | ||||
| * | Fix Sam Ruby's tests and deprecation warnings | Carlhuda | 2010-03-04 | 1 | -2/+2 |
| | | |||||
| * | Revert "In app_generator, fix hardcoded `bundle` call to derive the bundle ↵ | Carl Lerche | 2010-03-03 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | executable name from Thor::Util.ruby_command." This reverts commit 6f4c45199b791ac2c90aa6742f8ffbd62b02ed7b. This breaks the tests. Please investigate. | ||||
| * | In app_generator, fix hardcoded `bundle` call to derive the bundle ↵ | Caio Chassot | 2010-03-03 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | executable name from Thor::Util.ruby_command. This ensures that eg. when `rails` is called from `ruby1.9`, `bundle1.9` is called. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Removing prototype and just using vanilla js | Mikel Lindsaar | 2010-03-02 | 1 | -17/+17 |
| | | |||||
| * | vendor/rails doesn't work anymore, remove it from the blank slate suggestion | Joshua Peek | 2010-02-28 | 1 | -9/+0 |
| | | |||||
| * | the folder public/javascripts should be created by default [#4027 ↵ | Ramon Soares | 2010-02-26 | 1 | -2/+5 |
| | | | | | | | | | | | | status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | load_path is expecting a String in the application.rb generator | Thomas R. Koll | 2010-02-25 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Invalid namespace on app generation raises an error | Kyle Maxwell | 2010-02-17 | 1 | -2/+7 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-02-14 | 28 | -1133/+1711 |
|\| | | | | | | | | | | | | | | | Conflicts: railties/README railties/guides/source/active_support_core_extensions.textile railties/guides/source/getting_started.textile railties/lib/generators/rails/app/templates/README | ||||
| * | Resolve test/unit load ordering by removing backtrace filter from boot ↵ | Jeremy Kemper | 2010-02-11 | 1 | -2/+1 |
| | | | | | | | | initializers | ||||
| * | Suggest Mongrel and Capistrano in the default bundle | David Heinemeier Hansson | 2010-02-09 | 1 | -11/+17 |
| | | |||||
| * | Take into account gem versions (so script/rails server can work outside the ↵ | José Valim | 2010-02-08 | 1 | -1/+0 |
| | | | | | | | | application) and use Rails::Application.root instead of ROOT_PATH. | ||||
| * | Updating Prototype to 1.6.1 and script.aculo.us to 1.8.3 | Mikel Lindsaar | 2010-02-08 | 4 | -1041/+1593 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Check if Test::Unit is defined before adding backtrace filter. | José Valim | 2010-02-07 | 1 | -0/+1 |
| | | |||||
| * | fix usage examples and more to use new invocations | RomD | 2010-02-06 | 18 | -32/+32 |
| | | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com> | ||||
| * | Cleanup comments | David Heinemeier Hansson | 2010-02-05 | 1 | -8/+3 |
| | | |||||
| * | Not a fan of the double ## | David Heinemeier Hansson | 2010-02-05 | 1 | -2/+2 |
| | | |||||
| * | Simplify conditions for --dev and --edge | David Heinemeier Hansson | 2010-02-05 | 1 | -6/+6 |
| | | |||||
| * | Path approach shouldnt specify version | David Heinemeier Hansson | 2010-02-05 | 1 | -1/+1 |
| | | |||||
| * | New style for path references | David Heinemeier Hansson | 2010-02-05 | 1 | -2/+1 |
| | | |||||
| * | Add prototype ujs handler for data-method | Jeremy Kemper | 2010-02-04 | 1 | -0/+26 |
| | | |||||
| * | Update prototype-ujs for data-confirm | Jeremy Kemper | 2010-02-04 | 1 | -5/+12 |
| | | |||||
| * | Autorequire default libs and those in groups named after the current Rails ↵ | Jeremy Kemper | 2010-02-04 | 1 | -2/+2 |
| | | | | | | | | environment | ||||
| * | Revert "Rails script commands load the application rather than just boot" | Jeremy Kemper | 2010-02-04 | 1 | -1/+1 |
| | | | | | | | | This reverts commit 358451c2194c5b89b576fd623811da708ee89d95. | ||||
| * | Rails script commands load the application rather than just boot | Jeremy Kemper | 2010-02-04 | 1 | -1/+1 |
| | | |||||
| * | Move framework requires and Bundler.require from boot.rb to app.rb. Cut down ↵ | Jeremy Kemper | 2010-02-04 | 2 | -29/+14 |
| | | | | | | | | the list of railtie choices to those that make sense. | ||||
| * | Updated the database.yml file generated for ibm_db to the latest version of ↵ | Antonio Cangiano | 2010-02-04 | 1 | -11/+20 |
| | | | | | | | | | | | | | | | | DB2 and the gem. [#3852 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Change "script/server" to "rails server" in README. | Henrik N | 2010-02-06 | 1 | -8/+9 |
|/ | | | | Also console, dbconsole, generate. | ||||
* | Update Gemfile to use latest bundler config. | José Valim | 2010-02-04 | 2 | -20/+26 |
| | |||||
* | Use a normal gem source url instead of a magic symbol | Jeremy Kemper | 2010-02-04 | 1 | -1/+1 |
| | |||||
* | Autorequire bundled libraries by default | Jeremy Kemper | 2010-02-03 | 1 | -1/+4 |
| | |||||
* | Update rails to use the latest bundler | Carl Lerche | 2010-02-03 | 1 | -1/+1 |
| | |||||
* | Make bin/rails call rails/commands/application, fix generators usage and ↵ | José Valim | 2010-02-03 | 2 | -1/+2 |
| | | | | update .gitignores. | ||||
* | Updating index.html to remove script/generate and making railties tests pass ↵ | Mikel Lindsaar | 2010-02-02 | 1 | -1/+1 |
| | | | | again | ||||
* | Fix rails server | David Heinemeier Hansson | 2010-02-02 | 1 | -0/+1 |
| | |||||
* | Add a reminder that you should use "rails" not "script/rails" when running ↵ | David Heinemeier Hansson | 2010-02-02 | 1 | -0/+2 |
| | | | | normally | ||||
* | Removed all the default commands in script/* and replaced them with ↵ | David Heinemeier Hansson | 2010-02-02 | 11 | -31/+6 |
| | | | | script/rails and a rails command that'll act the same when run from within the app [DHH] | ||||
* | Get rid of deprecation warnings on config/environments/* | José Valim | 2010-02-02 | 3 | -7/+7 |
| | |||||
* | Updating USAGE information for Mailer generator [#3801 status:resolved] | Kieran Pilkington | 2010-02-02 | 1 | -1/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Fixed --dev flag for new bundler | Mikel Lindsaar | 2010-02-02 | 2 | -2/+2 |
| |