| Commit message (Expand) | Author | Age | Files | Lines |
* | Remove warning setting eager_load | Rafael Mendonça França | 2012-10-18 | 1 | -0/+1 |
* | Don't use action_controller.perform_caching to enable rack-rack. | Rafael Mendonça França | 2012-10-18 | 3 | -7/+14 |
* | Fix the app_generator and plugin_new tests | Rafael Mendonça França | 2012-10-18 | 2 | -1/+4 |
* | 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 | Joshua Peek | 2012-10-16 | 1 | -1/+1 |
* | | Switch to new sprockets-rails plugin | Joshua Peek | 2012-10-15 | 5 | -134/+59 |
|/ |
|
* | 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 | 100 | -507/+513 |
|\ |
|
| * | Fix typo in #7941 | Jeremy Kemper | 2012-10-14 | 1 | -1/+1 |
| * | Use Ruby 1.9 Hash syntax in railties | Robin Dupret | 2012-10-14 | 94 | -447/+447 |
| * | Test that a Rails.queue consumer is automatically started in production | Jeremy Kemper | 2012-10-13 | 3 | -3/+14 |
| * | Backpedal from class-oriented config.queue. Set an actual queue instance. | Jeremy Kemper | 2012-10-12 | 7 | -18/+10 |
| * | Tighten up asset precompile tests | Jeremy Kemper | 2012-10-12 | 2 | -4/+3 |
| * | Remove the queue container. Premature consolidation. Set up and maintain queu... | Jeremy Kemper | 2012-10-12 | 3 | -14/+9 |
| * | 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 | schneems | 2012-10-12 | 1 | -23/+32 |
* | | | Remove old asset_path from rails config | Joshua Peek | 2012-10-15 | 2 | -25/+1 |
|/ / |
|
* | | ActiveSupport::SynchronousQueue doesn't have the drain method. | Rafael Mendonça França | 2012-10-12 | 1 | -4/+4 |
* | | Move the TestQueue tests to the proper file | Rafael Mendonça França | 2012-10-12 | 1 | -47/+0 |
* | | Add .rake to `rake notes` and `rake notes:custom` | Brent J. Nordquist | 2012-10-12 | 3 | -8/+12 |
* | | Immediately run queued jobs in tests. Otherwise you have to explicitly drain ... | Jeremy Kemper | 2012-10-12 | 2 | -5/+5 |
* | | No need to test for rack-cache present in Gemfile | Arun Agrawal | 2012-10-11 | 1 | -5/+0 |
* | | Fixing build failures | Vijay Dev | 2012-10-11 | 6 | -14/+14 |
* | | 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 | Olivier Lacan | 2012-10-10 | 1 | -1/+3 |
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-10-11 | 40 | -94/+87 |
|\ \ \ |
|
| * | | | 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 railties/lib/rails/generators/rails/app/templates/config/environments/... | Adrien Lamothe | 2012-10-06 | 1 | -1/+2 |
* | | | | 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 | 32 | -127/+151 |
|\ \ \ \ |
|
| * | | | | warning fixed: ambiguous first argument; put parentheses or even spaces | Arun Agrawal | 2012-10-10 | 1 | -7/+7 |
| | |/ /
| |/| | |
|
| * | | | Update test locations | Mike Moore | 2012-10-09 | 26 | -93/+128 |
| * | | | Merge pull request #7885 from guilleiguaran/railties-changelog | Rafael Mendonça França | 2012-10-09 | 1 | -2/+7 |
| |\ \ \ |
|
| | * | | | Add missing entry in CHANGELOG about config.assets.cache change | Guillermo Iguaran | 2012-10-09 | 1 | -2/+7 |
| * | | | | Merge pull request #7883 from guilleiguaran/refactor-assets-test | Rafael Mendonça França | 2012-10-09 | 2 | -16/+1 |
| |\ \ \ \
| | |_|_|/
| |/| | | |
|
| | * | | | Remove duplicated test | Guillermo Iguaran | 2012-10-09 | 1 | -15/+0 |
| | * | | | Minor test refactoring: Use add_to_env instead of an initializer | Guillermo Iguaran | 2012-10-09 | 1 | -1/+1 |
| | |/ / |
|
| * / / | 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 |
| * | | 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. | Steve Klabnik | 2012-10-08 | 2 | -8/+7 |
* | | | | There is already an invitation to use rack-cache in config/environments/produ... | David Heinemeier Hansson | 2012-10-08 | 1 | -3/+0 |
|/ / / |
|