Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make the Rack::SSL middleware configurable | Justin Leitgeb | 2011-09-26 | 2 | -2/+4 |
| | |||||
* | `rake assets:precompile` loads the application but does not initialize it. | José Valim | 2011-09-24 | 4 | -15/+18 |
| | | | | | | | | | | | | | To the app developer, this means configuration add in config/initializers/* will not be executed. Plugins developers need to special case their initializers that are meant to be run in the assets group by adding :group => :assets. Conflicts: railties/CHANGELOG railties/test/application/assets_test.rb | ||||
* | Merge pull request #3027 from alex3/assets-precompile-regex-fix | Santiago Pastorino | 2011-09-21 | 1 | -1/+1 |
|\ | | | | | Default precompile regex was erroneously matching files | ||||
| * | Default precompile regexp that properly matches application.js and ↵ | Alex Yakoubian | 2011-09-16 | 1 | -1/+1 |
| | | | | | | | | application.css | ||||
* | | Add jquery-rails to Gemfile of plugins, test/dummy app uses it. | Santiago Pastorino | 2011-09-21 | 1 | -1/+4 |
|/ | | | | Closes #3091 | ||||
* | point rails at Journey for dev and edge | Aaron Patterson | 2011-09-12 | 2 | -0/+3 |
| | |||||
* | adjust route inspection to work with Journey | Aaron Patterson | 2011-09-12 | 1 | -1/+2 |
| | |||||
* | Merge pull request #2876 from alex3/patch-1 | Santiago Pastorino | 2011-09-09 | 1 | -1/+2 |
|\ | | | | | Fixed assets precompile regex | ||||
| * | Fixed assets precompile regex, now accepts Procs | Alex Yakoubian | 2011-09-08 | 1 | -1/+2 |
| | | |||||
* | | move route inspecting to an object so that we can more easily test it | Aaron Patterson | 2011-09-09 | 2 | -31/+45 |
|/ | |||||
* | Thanks to the hard work of Ken Collins ( @metaskills ) on the ActiveRecord ↵ | Wayne E. Seguin | 2011-09-07 | 1 | -2/+3 |
| | | | | | | | | SQLServer Adapter ( https://github.com/rails-sqlserver/activerecord-sqlserver-adapter ), AR SQLServer Adapter works for Linux, OSX and Windows. Thus the sqlserver adapter should include so that users may use it with the new application generator: rails new w00t -d sqlserver ... | ||||
* | Bump uglifier up | Santiago Pastorino | 2011-09-05 | 1 | -1/+1 |
| | |||||
* | Merge pull request #2873 from guilleiguaran/remove-unused-config | Santiago Pastorino | 2011-09-05 | 1 | -3/+0 |
|\ | | | | | Remove unused config variable from test.rb template | ||||
| * | Remove unused config variable from test.rb template | Guillermo Iguaran | 2011-09-05 | 1 | -3/+0 |
| | | |||||
* | | Merge pull request #2713 from FLOChip/500-fixed | José Valim | 2011-09-05 | 1 | -1/+0 |
|\ \ | |/ |/| | remove misleading line on 500 error page. #2648 | ||||
| * | remove misleading line on 500 error page. | Teng Siong Ong | 2011-08-27 | 1 | -1/+0 |
| | | |||||
| * | fixed 500 error message which is misleading by suggesting all rails apps ↵ | Jared Tame | 2011-08-27 | 1 | -1/+1 |
| | | | | | | | | have exception notifications by default | ||||
* | | Merge pull request #2841 from wojtekmach/app-generators-group | José Valim | 2011-09-04 | 1 | -1/+26 |
|\ \ | | | | | | | Add gem group support to generators | ||||
| * | | Add gem_group support to generators | Wojciech Mach | 2011-09-04 | 1 | -1/+26 |
| | | | |||||
* | | | Modified content in guides and comments | Arun Agrawal | 2011-09-04 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | for "assert /" warnings. Removed because if somebody will use this code they will get warnings! | ||||
* | | | Warnings removed for using shadow variable. | Arun Agrawal | 2011-09-04 | 1 | -2/+2 |
| | | | |||||
* | | | restores the API docs of AR::Fixtures, made a quick pass over them, revises ↵ | Xavier Noria | 2011-09-03 | 1 | -1/+1 |
|/ / | | | | | | | link in fixture template [closes #2840] | ||||
* | | Add bcrypt-ruby to Gemfile template | Guillermo Iguaran | 2011-09-03 | 1 | -0/+3 |
| | | |||||
* | | fix indent for generator environment method | Alexey Vakhov | 2011-09-02 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #2780 from guilleiguaran/assets-pipeline-minor-changes | Santiago Pastorino | 2011-08-31 | 1 | -1/+1 |
| | | | | | | | | Assets pipeline: fix in manifest location and remove unused code | ||||
* | | Set default location of manifest with config.assets.manifest | Guillermo Iguaran | 2011-08-31 | 2 | -0/+4 |
| | | |||||
* | | Backport f443f9cb0c64 to master | Guillermo Iguaran | 2011-08-31 | 3 | -6/+8 |
| | | |||||
* | | Backport b0f30631662 to master | Guillermo Iguaran | 2011-08-31 | 1 | -3/+2 |
| | | |||||
* | | Read digests of assets from manifest.yml if config.assets.manifest is on | Guillermo Iguaran | 2011-08-31 | 2 | -4/+9 |
|/ | |||||
* | Yes we need this to pass the test. we are using config.log_level. | Arun Agrawal | 2011-08-25 | 1 | -2/+2 |
| | | | | | Fix broken test test_copying_migrations(RailtiesTest::EngineTest): NoMethodError: undefined method `log_level' for #<Rails::Engine::Configuration:0xb87a98c> | ||||
* | fix ambiguous * and remove unused variable | Aaron Patterson | 2011-08-24 | 1 | -2/+2 |
| | |||||
* | fix ambiguous use of * | Aaron Patterson | 2011-08-24 | 1 | -1/+1 |
| | |||||
* | only define the encoding reader since we define the writer later on | Aaron Patterson | 2011-08-24 | 1 | -1/+2 |
| | |||||
* | we are *sure* we want to set the encoding, so silence warnings around it | Aaron Patterson | 2011-08-24 | 2 | -4/+9 |
| | |||||
* | dealing with some -w warnings on startup | Aaron Patterson | 2011-08-24 | 4 | -2/+9 |
| | |||||
* | Add config.allow_debugging option to determine if the debug_assets query ↵ | Guillermo Iguaran | 2011-08-24 | 3 | -6/+13 |
| | | | | param can be passed by user | ||||
* | Add destroy alias to engines | Guillermo Iguaran | 2011-08-22 | 1 | -2/+3 |
| | |||||
* | Merge pull request #2411 from ai/debug_assets_by_config | Santiago Pastorino | 2011-08-22 | 2 | -0/+4 |
|\ | | | | | Debug assets by config | ||||
| * | Allow to debug assets by config.assets.debug | Andrey A.I. Sitnik | 2011-08-22 | 2 | -0/+4 |
| | | |||||
* | | Add Destroy Alias | Andrey Ognevsky | 2011-08-22 | 1 | -1/+2 |
|/ | | | | | | | | * Added destroy alias to rails generator * add alias info for destroy command * Updated command line guides | ||||
* | Cleanup application.css | Rafa García | 2011-08-17 | 1 | -3/+3 |
| | |||||
* | Use lazy load hooks to set parameter wrapping configuration. This means that ↵ | Jon Leighton | 2011-08-16 | 1 | -7/+9 |
| | | | | it doesn't force Action Controller / Active Record to load, but it doesn't fail if they have already loaded. Thanks @josevalim for the hint. | ||||
* | Don't reference ActiveRecord::Base in initializers/wrap_parameters.rb. Use ↵ | Jon Leighton | 2011-08-16 | 1 | -5/+7 |
| | | | | config.active_record instead. This yields about a 20% decrease in startup time because it means that the connection is not created immediately on startup. Of course, this is only useful if you are not going to immediately use the database after startup. | ||||
* | Fix wrap_parameters initializer template | Jon Leighton | 2011-08-16 | 1 | -1/+1 |
| | |||||
* | Don't refer to ActionController::Base in the wrap_parameters initializer - ↵ | Jon Leighton | 2011-08-16 | 1 | -1/+1 |
| | | | | use config object instead. Cuts about 15% off the load time. (#734) | ||||
* | Requiring delegate. | Arun Agrawal | 2011-08-16 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Xavier Noria | 2011-08-13 | 1 | -1/+3 |
|\ | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Fix a bit precompile and lazy compile comments | Santiago Pastorino | 2011-08-13 | 1 | -4/+2 |
| | | |||||
| * | Don't require assets group in production by default, you can change this ↵ | Santiago Pastorino | 2011-08-13 | 1 | -3/+7 |
| | | | | | | | | default in the application.rb anyways | ||||
| * | use File.directory? as Dir.exists? is only 1.9.2+ | Aaron Patterson | 2011-08-13 | 1 | -2/+2 |
| | |