aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* 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-152-3/+3
| |
* | 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-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
| | |