Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix rails db command with sqlite3 database | Carlos Antonio da Silva | 2012-11-18 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | When using sqlite3 it was attempting to find the database file based on Rails.root, the problem is that Rails.root is not always present because we try to first manually load "config/database.yml" instead of loading the entire app, to make "rails db" faster. This means that when we're in the root path of the app, calling "rails db" won't allow us to use Rails.root, making the command fail for sqlite3 with the error: ./rails/commands/dbconsole.rb:62:in `start': undefined method `root' for Rails:Module (NoMethodError) The fix is to simply not pass any dir string to File.expand_path, which will make it use the current directory of the process as base, or the root path of the app, which is what we want. When we are in any other subdirectory, calling "rails db" should work just fine, because "config/database.yml" won't be found, thus "rails db" will fallback to loading the app, making Rails.root available. Closes #8257. | ||||
* | Adding sqlserver.yml template to satisfy "-d sqlserver" being given | Robert Nesius | 2012-11-16 | 1 | -0/+57 |
| | | | | invocations of "rails new". | ||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-11-17 | 1 | -1/+2 |
|\ | | | | | | | | | Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb | ||||
| * | Update production.rb: Split long comment in two lines | Guillermo Iguaran | 2012-11-12 | 1 | -1/+2 |
| | | |||||
| * | Update production.rb documentation: only files in app/assets are in ↵ | Guillermo Iguaran | 2012-11-12 | 1 | -1/+1 |
| | | | | | | | | config.assets.precompile | ||||
* | | Add UpgradeSignatureToEncryptionCookieStore | Santiago Pastorino | 2012-11-16 | 1 | -0/+2 |
| | | | | | | | | | | | | This allows easy upgrading from the old signed Cookie Store <= 3.2 or the deprecated one in 4.0 (the ones that doesn't use key derivation) to the new one that signs using key derivation | ||||
* | | Remove config.threadsafe! from production env template | Carlos Antonio da Silva | 2012-11-16 | 1 | -3/+0 |
| | | | | | | | | Closes #8232 [ci skip] | ||||
* | | Merge pull request #8112 from rails/encrypted_cookies | Santiago Pastorino | 2012-11-15 | 4 | -20/+49 |
|\ \ | | | | | | | Encrypted cookies | ||||
| * | | Rename secret_token_key to secret_key_base | Santiago Pastorino | 2012-11-03 | 3 | -10/+10 |
| | | | |||||
| * | | Cache generated keys per KeyGenerator instance using salt + key_size | Santiago Pastorino | 2012-11-03 | 1 | -5/+8 |
| | | | |||||
| * | | Allow users to change the default salt if they want, shouldn't be necessary | Santiago Pastorino | 2012-11-03 | 1 | -7/+15 |
| | | | |||||
| * | | Use derived keys everywhere, http_authentication was missing it | Santiago Pastorino | 2012-11-03 | 2 | -8/+5 |
| | | | |||||
| * | | Add encrypted cookie store | Santiago Pastorino | 2012-11-03 | 1 | -1/+1 |
| | | | |||||
| * | | Warn config.derive_keys will be true by default in 4.1 | Santiago Pastorino | 2012-11-03 | 1 | -9/+17 |
| | | | |||||
| * | | Sign cookies using key deriver | Santiago Pastorino | 2012-11-03 | 3 | -5/+18 |
| |/ | |||||
* | | Rake test:uncommitted finds git directory in ancestors. | Nicolas Despres | 2012-11-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes your git directory is an ancestor of your application root directory. For example: ./repo/.git/ ./repo/app/Rakefile In this case rake test:uncommitted will be unable to detect your SCM. This patch fixes this and add a test. | ||||
* | | Removing warning : assigned but unused variable | Arun Agrawal | 2012-11-10 | 1 | -1/+1 |
| | | |||||
* | | make the extremely useful logs debug level | Aaron Patterson | 2012-11-09 | 1 | -2/+2 |
| | | |||||
* | | copy the log level from the config settings | Aaron Patterson | 2012-11-09 | 1 | -0/+1 |
| | | |||||
* | | `plugin new` adds dummy app tasks when necessary. | Yves Senn | 2012-11-08 | 2 | -2/+6 |
| | | | | | | | | | | | | | | Closes #8121 The `plugin new` generator always adds the dummy app rake tasks, when a dummy app was created. | ||||
* | | Remove some line breaks between array items that make the assert file tests ↵ | Carlos Antonio da Silva | 2012-11-04 | 1 | -1/+1 |
|/ | | | | harder to read | ||||
* | Make caller attribute in deprecation methods optional | Alexey Gaziev | 2012-10-30 | 1 | -3/+2 |
| | |||||
* | Provide a call stack for deprecation warnings where needed. | Nikita Afanasenko | 2012-10-29 | 1 | -3/+4 |
| | | | | It's sometimes hard to quickly find where deprecated call was performed, especially in case of migrating between Rails versions. So this is an attempt to improve the call stack part of the warning message by providing caller explicitly. | ||||
* | Merge pull request #7587 from elia/fix-too-eager-loading | Rafael Mendonça França | 2012-10-29 | 1 | -6/+12 |
| | | | | | | Should not eager_load app/assets Conflicts: railties/CHANGELOG.md | ||||
* | USe the released version of sprockets-rails in a new Rails 4 application | Rafael Mendonça França | 2012-10-27 | 1 | -1/+1 |
| | |||||
* | Job consumer logs to Rails.logger by default | Jeremy Kemper | 2012-10-26 | 1 | -0/+1 |
| | |||||
* | Remove extra line in Gemfile under turbolinks. | Geoffrey Roguelon | 2012-10-21 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-10-21 | 1 | -1/+1 |
|\ | | | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/slice.rb guides/source/active_support_core_extensions.md | ||||
| * | Corrected the logic in production.rb comment. | Robb Shecter | 2012-10-18 | 1 | -1/+1 |
| | | |||||
| * | Moving code base to 1.9 hash syntax | AvnerCohen | 2012-10-16 | 3 | -7/+7 |
| | | |||||
| * | Hash syntax to 1.9 style | AvnerCohen | 2012-10-15 | 1 | -2/+2 |
| | | |||||
* | | We don't need this anymore since we had a sprockets-rails release | Rafael Mendonça França | 2012-10-19 | 1 | -3/+0 |
| | | |||||
* | | Don't use action_controller.perform_caching to enable rack-rack. | Rafael Mendonça França | 2012-10-18 | 1 | -1/+1 |
| | | | | | | | | | | Setting the action_dispatch.rack_cache options to true or a hash should be the way to enable it. | ||||
* | | Fix the app_generator and plugin_new tests | Rafael Mendonça França | 2012-10-18 | 1 | -0/+3 |
| | | |||||
* | | Now the Sprockets railtie lives in sprockets/railtie | Rafael Mendonça França | 2012-10-18 | 3 | -3/+3 |
| | | |||||
* | | Change back to official sprockets-rails | Joshua Peek | 2012-10-17 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #7968 from josh/only-precompile-app-assets-by-default | Rafael Mendonça França | 2012-10-17 | 1 | -1/+1 |
|\ \ | | | | | | | Only compile non-js/css under app/assets by default | ||||
| * | | Only compile non-js/css under app/assets by default | Joshua Peek | 2012-10-16 | 1 | -1/+1 |
| | | | |||||
* | | | Switch to new sprockets-rails plugin | Joshua Peek | 2012-10-15 | 3 | -7/+5 |
|/ / | |||||
* | | Use sprockets-rails master | Joshua Peek | 2012-10-15 | 1 | -2/+2 |
| | | |||||
* | | Use sprockets-rails branch for now | Joshua Peek | 2012-10-15 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into asset-path-helper | Joshua Peek | 2012-10-15 | 64 | -265/+271 |
|\ \ | | | | | | | | | | | | | Conflicts: railties/test/application/configuration_test.rb | ||||
| * | | Use Ruby 1.9 Hash syntax in railties | Robin Dupret | 2012-10-14 | 61 | -231/+231 |
| | | | |||||
| * | | Test that a Rails.queue consumer is automatically started in production | Jeremy Kemper | 2012-10-13 | 2 | -2/+3 |
| | | | |||||
| * | | Backpedal from class-oriented config.queue. Set an actual queue instance. | Jeremy Kemper | 2012-10-12 | 4 | -5/+5 |
| | | | |||||
| * | | Remove the queue container. Premature consolidation. Set up and maintain ↵ | Jeremy Kemper | 2012-10-12 | 1 | -5/+1 |
| | | | | | | | | | | | | queues in the classes that use them instead. | ||||
| * | | Merge pull request #7891 from schneems/schneems/rake_command_warning | José Valim | 2012-10-12 | 1 | -23/+32 |
| |\ \ | | | | | | | | | Prompt to run rake when accidentally typed rails | ||||
| | * | | Prompt to run rake when accidentally typed rails | schneems | 2012-10-12 | 1 | -23/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Developers from all levels will accidentally run rake tasks using the `rails` keyword when they meant to use `rake`. Often times beginners struggle with the difference between the tools. The most common example would be `$ rails db:migrate` Rather than telling the developer simply that they did not use a valid rails command, we can see if it was a valid rake command first. If it is a valid rake command we can auto execute it giving the user a period of time to cancel if that isn't what they intended. Here is what `rake db:migrate` would look like if you cancel the command: ```sh $ rails db:migrate Assuming you meant: $ rake db:migrate press any key to cancel in 3 seconds > command terminated ... ``` Here is what it looks like if you don't cancel the command: ```sh $ rails db:migrate Assuming you meant: $ rake db:migrate press any key to cancel in 3 seconds > Running: $ rake db:migrate == Foo: migrating ============================================================ == Foo: migrated (0.0000s) =================================================== ``` | ||||
* | | | | Remove old asset_path from rails config | Joshua Peek | 2012-10-15 | 1 | -5/+1 |
|/ / / | |||||
* | | | Add .rake to `rake notes` and `rake notes:custom` | Brent J. Nordquist | 2012-10-12 | 1 | -7/+7 |
| | | |