| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | ||||
| * | Make sure that RAILS_ENV is set when accessing Rails.env | Steve Klabnik | 2012-10-31 | 1 | -1/+4 |
| | | | | | Fixes #8025 | ||||
| * | 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 | 2 | -3/+3 |
| | | | |||||
| * | | 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 | 65 | -266/+272 |
| |\ \ | | | | | | | | | | | | | Conflicts: railties/test/application/configuration_test.rb | ||||
| | * | | Use Ruby 1.9 Hash syntax in railties | Robin Dupret | 2012-10-14 | 62 | -232/+232 |
| | | | | |||||
| | * | | 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 |
| | | | | |||||
| * | | | Immediately run queued jobs in tests. Otherwise you have to explicitly drain ↵ | Jeremy Kemper | 2012-10-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | the queue to actually deliver your emails. | ||||
| * | | | Fixing build failures | Vijay Dev | 2012-10-11 | 6 | -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_instructions | Vijay Dev | 2012-10-10 | 1 | -1/+3 |
| |\ \ \ | |_|/ |/| | | Offer instructions for pg gem when installed via Homebrew | ||||
| | * | | Offer instructions for pg gem when installed via Homebrew | Olivier Lacan | 2012-10-10 | 1 | -1/+3 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-10-11 | 40 | -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 comment | Vijay Dev | 2012-10-11 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | update Rails::Generators docs [ci skip] | Francesco Rodriguez | 2012-10-07 | 22 | -43/+35 |
| | | | | | |||||
| | * | | | nodoc JS::Generators [ci skip] | Francesco Rodriguez | 2012-10-07 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | nodoc Erb::Generators [ci skip] | Francesco Rodriguez | 2012-10-07 | 4 | -11/+11 |
| | | | | | |||||
| | * | | | nodoc CSS::Generators [ci skip] | Francesco Rodriguez | 2012-10-07 | 2 | -6/+6 |
| | | | | | |||||
| | * | | | nodoc TestUnit::Generators [ci skip] | Francesco Rodriguez | 2012-10-07 | 10 | -30/+30 |
| | | | | | |||||
| | * | | | Update ↵ | Adrien Lamothe | 2012-10-06 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt | ||||
| * | | | | fix github url [ci skip] | Vijay Dev | 2012-10-11 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2012-10-10 | 17 | -37/+66 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | Update test locations | Mike Moore | 2012-10-09 | 14 | -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 instead | Guillermo Iguaran | 2012-10-09 | 1 | -3/+3 |
| | | | | |||||
| | * | | Remove duplicate 'the' article in commented line | claudiob | 2012-10-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | The sentence used to read "at the bottom of the the compiled file" | ||||
| | * | | Merge pull request #7873 from steveklabnik/update_initializer | David Heinemeier Hansson | 2012-10-08 | 2 | -8/+7 |
| | |\ \ | | | | | | | | | Moving locale stuff from app.rb to an initializer. | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |