aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* Fix rails db command with sqlite3 databaseCarlos Antonio da Silva2012-11-181-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 givenRobert Nesius2012-11-161-0/+57
| | | | invocations of "rails new".
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-11-171-1/+2
|\ | | | | | | | | Conflicts: actionpack/lib/action_dispatch/routing/redirection.rb
| * Update production.rb: Split long comment in two linesGuillermo Iguaran2012-11-121-1/+2
| |
| * Update production.rb documentation: only files in app/assets are in ↵Guillermo Iguaran2012-11-121-1/+1
| | | | | | | | config.assets.precompile
* | Add UpgradeSignatureToEncryptionCookieStoreSantiago Pastorino2012-11-161-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 templateCarlos Antonio da Silva2012-11-161-3/+0
| | | | | | | | Closes #8232 [ci skip]
* | Merge pull request #8112 from rails/encrypted_cookiesSantiago Pastorino2012-11-154-20/+49
|\ \ | | | | | | Encrypted cookies
| * | Rename secret_token_key to secret_key_baseSantiago Pastorino2012-11-033-10/+10
| | |
| * | Cache generated keys per KeyGenerator instance using salt + key_sizeSantiago Pastorino2012-11-031-5/+8
| | |
| * | Allow users to change the default salt if they want, shouldn't be necessarySantiago Pastorino2012-11-031-7/+15
| | |
| * | Use derived keys everywhere, http_authentication was missing itSantiago Pastorino2012-11-032-8/+5
| | |
| * | Add encrypted cookie storeSantiago Pastorino2012-11-031-1/+1
| | |
| * | Warn config.derive_keys will be true by default in 4.1Santiago Pastorino2012-11-031-9/+17
| | |
| * | Sign cookies using key deriverSantiago Pastorino2012-11-033-5/+18
| |/
* | Rake test:uncommitted finds git directory in ancestors.Nicolas Despres2012-11-101-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 variableArun Agrawal2012-11-101-1/+1
| |
* | make the extremely useful logs debug levelAaron Patterson2012-11-091-2/+2
| |
* | copy the log level from the config settingsAaron Patterson2012-11-091-0/+1
| |
* | `plugin new` adds dummy app tasks when necessary.Yves Senn2012-11-082-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 Silva2012-11-041-1/+1
|/ | | | harder to read
* Make caller attribute in deprecation methods optionalAlexey Gaziev2012-10-301-3/+2
|
* Provide a call stack for deprecation warnings where needed.Nikita Afanasenko2012-10-291-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-loadingRafael Mendonça França2012-10-291-6/+12
| | | | | | Should not eager_load app/assets Conflicts: railties/CHANGELOG.md
* USe the released version of sprockets-rails in a new Rails 4 applicationRafael Mendonça França2012-10-271-1/+1
|
* Job consumer logs to Rails.logger by defaultJeremy Kemper2012-10-261-0/+1
|
* Remove extra line in Gemfile under turbolinks.Geoffrey Roguelon2012-10-211-1/+1
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-10-211-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 Shecter2012-10-181-1/+1
| |
| * Moving code base to 1.9 hash syntaxAvnerCohen2012-10-163-7/+7
| |
| * Hash syntax to 1.9 styleAvnerCohen2012-10-151-2/+2
| |
* | We don't need this anymore since we had a sprockets-rails releaseRafael Mendonça França2012-10-191-3/+0
| |
* | Don't use action_controller.perform_caching to enable rack-rack.Rafael Mendonça França2012-10-181-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 testsRafael Mendonça França2012-10-181-0/+3
| |
* | Now the Sprockets railtie lives in sprockets/railtieRafael Mendonça França2012-10-183-3/+3
| |
* | Change back to official sprockets-railsJoshua Peek2012-10-171-2/+2
| |
* | Merge pull request #7968 from josh/only-precompile-app-assets-by-defaultRafael Mendonça França2012-10-171-1/+1
|\ \ | | | | | | Only compile non-js/css under app/assets by default
| * | Only compile non-js/css under app/assets by defaultJoshua Peek2012-10-161-1/+1
| | |
* | | Switch to new sprockets-rails pluginJoshua Peek2012-10-153-7/+5
|/ /
* | Use sprockets-rails masterJoshua Peek2012-10-151-2/+2
| |
* | Use sprockets-rails branch for nowJoshua Peek2012-10-151-2/+2
| |
* | Merge branch 'master' into asset-path-helperJoshua Peek2012-10-1564-265/+271
|\ \ | | | | | | | | | | | | Conflicts: railties/test/application/configuration_test.rb
| * | Use Ruby 1.9 Hash syntax in railtiesRobin Dupret2012-10-1461-231/+231
| | |
| * | Test that a Rails.queue consumer is automatically started in productionJeremy Kemper2012-10-132-2/+3
| | |
| * | Backpedal from class-oriented config.queue. Set an actual queue instance.Jeremy Kemper2012-10-124-5/+5
| | |
| * | Remove the queue container. Premature consolidation. Set up and maintain ↵Jeremy Kemper2012-10-121-5/+1
| | | | | | | | | | | | queues in the classes that use them instead.
| * | Merge pull request #7891 from schneems/schneems/rake_command_warningJosé Valim2012-10-121-23/+32
| |\ \ | | | | | | | | Prompt to run rake when accidentally typed rails
| | * | Prompt to run rake when accidentally typed railsschneems2012-10-121-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 configJoshua Peek2012-10-151-5/+1
|/ / /
* | | Add .rake to `rake notes` and `rake notes:custom`Brent J. Nordquist2012-10-121-7/+7
| | |