Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' of github.com:lifo/docrails | Xavier Noria | 2011-08-13 | 1 | -0/+8 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: RELEASING_RAILS.rdoc actionpack/lib/sprockets/railtie.rb actionpack/test/template/sprockets_helper_test.rb activerecord/test/cases/calculations_test.rb railties/guides/source/3_1_release_notes.textile railties/guides/source/active_resource_basics.textile railties/guides/source/command_line.textile | |||||
| * | | Merge pull request #2324 from zenapsis/3-1-stable | Santiago Pastorino | 2011-08-13 | 1 | -0/+14 | |
| | | | | | | | | | | | | Rails 3.1 throws a Errno::ENOTDIR if files are put in assets directories | |||||
| * | | Covering more files in test for plugin new generator. | Vishnu Atrai | 2011-08-13 | 1 | -0/+2 | |
| | | | ||||||
| * | | Test add for plugin new generator generate mailer | Arun Agrawal | 2011-08-13 | 1 | -4/+5 | |
| | | | ||||||
| * | | pluging generator test fix | Vishnu Atrai | 2011-08-13 | 1 | -8/+8 | |
| | | | ||||||
| * | | Check that Rack::Sendfile is not included unless ↵ | Santiago Pastorino | 2011-08-13 | 1 | -0/+8 | |
| | | | | | | | | | | | | config.action_dispatch.x_sendfile_header is set | |||||
* | | | Merge pull request #2448 from igrigorik/master | Joshua Peek | 2011-08-08 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Asset pipeline fixes: clear out tmp cache and use environment in digest generation | |||||
| * | | | Clear out tmp/cache when assets:clean is invoked. | Ilya Grigorik | 2011-08-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, if bad data is cached in tmp/clear then the next invocation of assets:precompile (or a regular incoming request) will pickup files from tmp without regenerating them from source. | |||||
* | | | | x_sendfile_header now defaults to nil and production.rb env file doesn't | Santiago Pastorino | 2011-08-07 | 2 | -9/+2 | |
|/ / / | | | | | | | | | | | | | | | | | | | set a particular value for it. This allows servers to set it through X-Sendfile-Type, read https://github.com/rack/rack/blob/master/lib/rack/sendfile.rb for more info. Anyways you can force this value in your production.rb | |||||
* | / | Merge pull request #2324 from zenapsis/3-1-stable | Santiago Pastorino | 2011-08-01 | 1 | -0/+14 | |
| |/ |/| | | | | | Rails 3.1 throws a Errno::ENOTDIR if files are put in assets directories | |||||
* | | Covering more files in test for plugin new generator. | Vishnu Atrai | 2011-07-29 | 1 | -0/+2 | |
| | | ||||||
* | | Test add for plugin new generator generate mailer | Arun Agrawal | 2011-07-29 | 1 | -4/+5 | |
| | | ||||||
* | | pluging generator test fix | Vishnu Atrai | 2011-07-28 | 1 | -8/+8 | |
| | | ||||||
* | | Check that Rack::Sendfile is not included unless ↵ | Santiago Pastorino | 2011-07-26 | 1 | -0/+8 | |
|/ | | | | config.action_dispatch.x_sendfile_header is set | |||||
* | provide more explicit test names | Damien Mathieu | 2011-07-25 | 1 | -2/+2 | |
| | ||||||
* | Merge pull request #2247 from dmathieu/test_precompile_caching | José Valim | 2011-07-25 | 1 | -1/+11 | |
|\ | | | | | Add test checking that precompiling assets performs caching | |||||
| * | add test checking that precompiling assets performs caching | Damien Mathieu | 2011-07-25 | 1 | -1/+11 | |
| | | ||||||
* | | Make polymorphic_url calls go through application helpers again. | thedarkone | 2011-07-25 | 1 | -0/+19 | |
|/ | | | | This brings back the ability to overwrite/extend url generating methods in application heleprs. | |||||
* | Merge pull request #2116 from guilleiguaran/fix-environment-generator-action | Santiago Pastorino | 2011-07-18 | 1 | -0/+7 | |
|\ | | | | | Fix Rails::Generators::Actions#environment when env is passed | |||||
| * | Fix Rails::Generators::Actions#environment when env is passed. Closes #2110 | Guillermo Iguaran | 2011-07-18 | 1 | -0/+7 | |
| | | ||||||
* | | As we are adding db folder in it. Required in test also. | Arun Agrawal | 2011-07-17 | 1 | -1/+1 | |
|/ | ||||||
* | Improve formatting of route to Rack application in rake routes. | Hendy Tanata | 2011-07-17 | 1 | -0/+21 | |
| | | | | | | | | | | This route: match 'foo/:id' => RackApp, :id => /[A-Z]\d{5}/ is shown as: /foo/:id(.:format) RackApp {:id=>/[A-Z]\d{5}/} | |||||
* | Better formatting of route requirements in rake:routes. | Hendy Tanata | 2011-07-16 | 1 | -2/+65 | |
| | | | | | | | | | | Previously it was: {:controller=>"photos", :action=>"show", :id=>/[A-Z]\d{5}/} Now it becomes: photos#show {:id=>/[A-Z]\d{5}/} | |||||
* | Use cache/assets instead. | José Valim | 2011-07-12 | 1 | -1/+1 | |
| | ||||||
* | assets.cache_store now defaults to filesystem. You will want to share ↵ | José Valim | 2011-07-12 | 2 | -1/+1 | |
| | | | | tmp/assets_cache between deploys. | |||||
* | Generate valid default fixtures for models with a type column | Marc-Andre Lafortune | 2011-07-11 | 1 | -0/+5 | |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | Rails.application#env_config is now public API. [Closes #1924] | Franck Verrot | 2011-07-11 | 1 | -0/+9 | |
| | ||||||
* | Make Rails.groups accept arrays. | José Valim | 2011-07-10 | 1 | -1/+1 | |
| | ||||||
* | Don't raise on mass assignment for test | José Valim | 2011-07-07 | 1 | -6/+15 | |
| | ||||||
* | Ensure the engine_path is there (it may make CI happy). | José Valim | 2011-07-06 | 1 | -1/+1 | |
| | ||||||
* | Make compressors lazily load. | José Valim | 2011-07-06 | 1 | -0/+11 | |
| | ||||||
* | Merge pull request #1926 from tobsch/master | Santiago Pastorino | 2011-07-06 | 1 | -4/+7 | |
|\ | | | | | Accept application.js/.css to exist in a deeper directory depth by default | |||||
| * | Now accepting css/js files in deeper directory structures by default. | Tobias Schlottke | 2011-07-01 | 1 | -4/+7 | |
| | | | | | | | | | | This is useful for engines with own application.{js|css}-files. See: https://github.com/rails/rails/issues/1520 | |||||
* | | fix engines rake tasks | Jake Varghese | 2011-07-04 | 1 | -0/+8 | |
| | | ||||||
* | | Load the generators test helper and properly load it's test case | Damien Mathieu | 2011-07-03 | 1 | -1/+2 | |
| | | ||||||
* | | Fix has_migrations? check in Rails::Engine | Sam Pohlenz | 2011-07-03 | 1 | -0/+9 | |
|/ | ||||||
* | Move Coffee generators and templates to Coffee Railtie and create ↵ | Santiago Pastorino | 2011-06-29 | 3 | -23/+10 | |
| | | | | javascript_engine ("js") for apps that remove Coffee gem | |||||
* | Merge pull request #1899 from ihower/patch_rake_test | José Valim | 2011-06-29 | 1 | -0/+26 | |
|\ | | | | | Make "rake test" display not only task name but also exception message. | |||||
| * | Add test to rake test for error messages | Wen-Tien Chang | 2011-06-30 | 1 | -0/+26 | |
| | | ||||||
* | | [IMPORTANT] Make "sprockets/railtie" require explicit. | José Valim | 2011-06-29 | 1 | -4/+10 | |
|/ | | | | | | | | | | This makes "sprockets/railtie" explicit. This means that sprockets will be loaded when you require "rails/all". If you are not using requiring "rails/all", you need to manually load it with all other framework railties. In order to be complete, this commit also adds --skip-sprockets to the rails generator. | |||||
* | fix test when running Jruby. If Jruby Platform is available the gem will change. | Arun Agrawal | 2011-06-29 | 1 | -2/+10 | |
| | ||||||
* | Merge pull request #1481 from arunagw/lib_assets | David Heinemeier Hansson | 2011-06-27 | 1 | -1/+2 | |
|\ | | | | | Generating /lib/assets for assets | |||||
| * | Using lib/assets only. Javascripts/Stylesheets people can fill later. | Arun Agrawal | 2011-06-16 | 1 | -1/+2 | |
| | | ||||||
* | | Tests added when no option is given with #jruby. It should generate | Arun Agrawal | 2011-06-22 | 1 | -0/+8 | |
| | | | | | | | | sqlite3 based app | |||||
* | | Making tests according to the changes #jruby | Arun Agrawal | 2011-06-22 | 1 | -3/+4 | |
| | | ||||||
* | | Test added for jdbc-adapter | Arun Agrawal | 2011-06-22 | 1 | -0/+6 | |
| | | ||||||
* | | Railties: added tests for rake assets:clean | James A. Rosen | 2011-06-21 | 1 | -0/+14 | |
| | | ||||||
* | | Create an :assets group in the Gemfile. | José Valim | 2011-06-21 | 2 | -1/+17 | |
| | | | | | | | | | | | | | | | | | | This group is required by default only on development and test (you can change it on config/application.rb). `rake assets:precompile` will automatically add the assets group to Rails.groups (and consequently Bundler.require) and should work transparently. | |||||
* | | Add Rails.groups to encapsulate available groups for require. | José Valim | 2011-06-21 | 1 | -0/+15 | |
| | | ||||||
* | | Removed tests for rescue branch for Rails 2.x compatibility | Alexey Gaziev | 2011-06-20 | 2 | -9/+0 | |
| | |