aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into asset-path-helperJoshua Peek2012-10-1565-266/+272
|\ | | | | | | | | Conflicts: railties/test/application/configuration_test.rb
| * Use Ruby 1.9 Hash syntax in railtiesRobin Dupret2012-10-1462-232/+232
| |
| * 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
| |
* | Immediately run queued jobs in tests. Otherwise you have to explicitly drain ↵Jeremy Kemper2012-10-121-2/+2
| | | | | | | | the queue to actually deliver your emails.
* | Fixing build failuresVijay Dev2012-10-116-14/+14
| | | | | | | | | | | | | | Build failed with an error "invalid multibyte char (US-ASCII)" in these files. Apparently, some UTF-8 char disguised as whitespace causes this. Thanks @rafaelfranca
* | Merge pull request #7898 from olivierlacan/pg_homebrew_instructionsVijay Dev2012-10-101-1/+3
|\ \ | | | | | | Offer instructions for pg gem when installed via Homebrew
| * | Offer instructions for pg gem when installed via HomebrewOlivier Lacan2012-10-101-1/+3
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-10-1140-94/+87
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/persistence.rb railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
| * | | copy-edit the email delivery errors commentVijay Dev2012-10-111-1/+1
| | | |
| * | | update Rails::Generators docs [ci skip]Francesco Rodriguez2012-10-0722-43/+35
| | | |
| * | | nodoc JS::Generators [ci skip]Francesco Rodriguez2012-10-071-3/+3
| | | |
| * | | nodoc Erb::Generators [ci skip]Francesco Rodriguez2012-10-074-11/+11
| | | |
| * | | nodoc CSS::Generators [ci skip]Francesco Rodriguez2012-10-072-6/+6
| | | |
| * | | nodoc TestUnit::Generators [ci skip]Francesco Rodriguez2012-10-0710-30/+30
| | | |
| * | | Update ↵Adrien Lamothe2012-10-061-1/+2
| | | | | | | | | | | | | | | | railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
* | | | fix github url [ci skip]Vijay Dev2012-10-111-1/+1
| | | |
* | | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2012-10-1017-37/+66
|\ \ \ \ | | |/ / | |/| |
| * | | Update test locationsMike Moore2012-10-0914-28/+58
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default test locations to avoid confusion around the common testing terms "unit" and "functional". Add new rake tasks for the new locations, while maintaining backwards compatibility with the old rake tasks. New testing locations are as follows: app/models -> test/models (was test/units) app/helpers -> test/helpers (was test/units/helpers) app/controllers -> test/controllers (was test/functional) app/mailers -> test/mailers (was test/functional)
| * | Rails.config doesn't exist, it should be Rails.application.config insteadGuillermo Iguaran2012-10-091-3/+3
| | |
| * | Remove duplicate 'the' article in commented lineclaudiob2012-10-081-1/+1
| | | | | | | | | | | | The sentence used to read "at the bottom of the the compiled file"
| * | Merge pull request #7873 from steveklabnik/update_initializerDavid Heinemeier Hansson2012-10-082-8/+7
| |\ \ | | | | | | | | Moving locale stuff from app.rb to an initializer.
| | * | Moving locale stuff from app.rb to an initializer.Steve Klabnik2012-10-082-8/+7
| | | |
* | | | There is already an invitation to use rack-cache in ↵David Heinemeier Hansson2012-10-081-3/+0
|/ / / | | | | | | | | | config/environments/production.rb
* | | Cleanup comments a bit and fuck 80 charactersDavid Heinemeier Hansson2012-10-081-16/+10
| | |
* | | Inline commentDavid Heinemeier Hansson2012-10-081-3/+1
|/ /
* | Encoding already defaults to utf-8 per lib/rails/application/configuration.rb:23David Heinemeier Hansson2012-10-081-3/+0
| |
* | Everyone is running bundler, no need for defensive programming shitDavid Heinemeier Hansson2012-10-081-2/+2
| |
* | Not precompiling your assets for production is a bad idea -- do not encourage itDavid Heinemeier Hansson2012-10-081-6/+2
| |
* | Rename "Fixtures" class to "FixtureSet"Alexey Muranov2012-10-071-2/+2
| | | | | | | | Rename `ActiveRecord::Fixtures` class to `ActiveRecord::FixtureSet`. Instances of this class normally hold a collection of fixtures (records) loaded either from a single YAML file, or from a file and a folder with the same name. This change make the class name singular and makes the class easier to distinguish from the modules like `ActiveRecord::TestFixtures`, which operates on multiple fixture sets, or `DelegatingFixtures`, `::Fixtures`, etc., and from the class `ActiveRecord::Fixture`, which corresponds to a single fixture.
* | Gotta log each spacer line separately to ensure each is taggedJeremy Kemper2012-10-061-1/+4
| |
* | Tag the blank log line between dev requests so it's easier to filter out ↵Jeremy Kemper2012-10-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | entire requests with grep -v without leaving a stray newline behind. Example: # Tag asset requests so it's easy to filter them from dev logs config.log_tags = [ -> request { :assets if request.path.starts_with?(config.assets.prefix) }, -> request { request.uuid } ] # Watch the logs, ignoring asset requests $ tail -100f log/development.log | grep -v assets
* | Remove unneeded attr_readerRafael Mendonça França2012-10-071-1/+0
| |
* | use Rails backtrace in testsFrancesco Rodriguez2012-10-051-0/+4
| |
* | Revert "Use flat_map { } instead of map {}.flatten"Santiago Pastorino2012-10-054-5/+5
| | | | | | | | | | | | | | | | | | | | | | This reverts commit abf8de85519141496a6773310964ec03f6106f3f. We should take a deeper look to those cases flat_map doesn't do deep flattening. irb(main):002:0> [[[1,3], [1,2]]].map{|i| i}.flatten => [1, 3, 1, 2] irb(main):003:0> [[[1,3], [1,2]]].flat_map{|i| i} => [[1, 3], [1, 2]]
* | Use flat_map { } instead of map {}.flattenSantiago Pastorino2012-10-054-5/+5
| |
* | Comment rack-cache entry on GemfileGuillermo Iguaran2012-10-041-1/+1
| |
* | config.action_dispatch.rack_cache should set explicitly to enable Rack::CacheGuillermo Iguaran2012-10-042-0/+14
| |
* | Strip heredoc to not generate the Gemfile with trailing spacesRafael Mendonça França2012-10-041-2/+2
| |
* | Turn turbolinks on by default for new appsDavid Heinemeier Hansson2012-10-043-4/+11
| |
* | Make Rails.public_path return a PathnamePrem Sichanugrist2012-10-021-1/+1
| |
* | Merge pull request #6952 from NZKoz/key_generatorMichael Koziarski2012-10-021-1/+10
|\ \ | | | | | | Add ActiveSupport::KeyGenerator as a simple wrapper around PBKDF2
| * | Provide access to the application's KeyGeneratorMichael Koziarski2012-10-011-1/+10
| | | | | | | | | | | | Available both as an env entry for rack and an instance method on Rails::Application for other uses
* | | Merge pull request #7794 from guilleiguaran/extract-rack-cacheSantiago Pastorino2012-10-012-0/+10
|\ \ \ | | | | | | | | Use Rack::Cache middleware only if is in Gemfile
| * | | Add rack-cache to default GemfileGuillermo Iguaran2012-10-011-0/+4
| | | |