aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* | Fix deprecation message in test for Path#childrenCarlos Antonio da Silva2012-10-291-1/+1
|/
* Add test to deprecation of Path#childrenRafael Mendonça França2012-10-291-0/+6
|
* Merge pull request #7587 from elia/fix-too-eager-loadingRafael Mendonça França2012-10-293-6/+17
| | | | | | 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-262-0/+2
|
* changed test case nameTima Maslyuchenko2012-10-231-1/+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-152-3/+3
| |
* | We don't need this anymore since we had a sprockets-rails releaseRafael Mendonça França2012-10-191-3/+0
| |
* | Remove warning setting eager_loadRafael Mendonça França2012-10-181-0/+1
| |
* | Don't use action_controller.perform_caching to enable rack-rack.Rafael Mendonça França2012-10-183-7/+14
| | | | | | | | | | 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-182-1/+4
| |
* | 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-155-134/+59
|/ /
* | 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-15100-507/+513
|\ \ | | | | | | | | | | | | Conflicts: railties/test/application/configuration_test.rb
| * | Fix typo in #7941Jeremy Kemper2012-10-141-1/+1
| | |
| * | Use Ruby 1.9 Hash syntax in railtiesRobin Dupret2012-10-1494-447/+447
| | |
| * | Test that a Rails.queue consumer is automatically started in productionJeremy Kemper2012-10-133-3/+14
| | |
| * | Backpedal from class-oriented config.queue. Set an actual queue instance.Jeremy Kemper2012-10-127-18/+10
| | |
| * | Tighten up asset precompile testsJeremy Kemper2012-10-122-4/+3
| | |
| * | Remove the queue container. Premature consolidation. Set up and maintain ↵Jeremy Kemper2012-10-123-14/+9
| | | | | | | | | | | | 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-152-25/+1
|/ / /
* | | ActiveSupport::SynchronousQueue doesn't have the drain method.Rafael Mendonça França2012-10-121-4/+4
| | | | | | | | | | | | | | | Now we are using teh SynchronousQueue in the test environment instead of the TestQueue
* | | Move the TestQueue tests to the proper fileRafael Mendonça França2012-10-121-47/+0
| | |
* | | Add .rake to `rake notes` and `rake notes:custom`Brent J. Nordquist2012-10-123-8/+12
| | |
* | | Immediately run queued jobs in tests. Otherwise you have to explicitly drain ↵Jeremy Kemper2012-10-122-5/+5
| | | | | | | | | | | | the queue to actually deliver your emails.
* | | No need to test for rack-cache present in GemfileArun Agrawal2012-10-111-5/+0
| | | | | | | | | | | | | | | | | | as it's removed here 1fc795468525d8622cdca474a54c8310a514aa46
* | | 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-1032-127/+151
|\ \ \ \