Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Add config.file_watcher so developers can provide their own watchers (for ↵ | José Valim | 2011-12-13 | 4 | -8/+87 | |
| | | | | | | | | | | | | instance, hooking on fsevents). | |||||
* | | | Merge pull request #3958 from lest/comment-on-whitelist | José Valim | 2011-12-12 | 1 | -0/+6 | |
|\ \ \ | | | | | | | | | commented whitelist mode enforcement for mass assignment | |||||
| * | | | commented whitelist mode enforcement for mass assignment | lest | 2011-12-13 | 1 | -0/+6 | |
| | | | | ||||||
* | | | | Revert "Provide a unique point for running initializers." | José Valim | 2011-12-13 | 4 | -13/+10 | |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c2e3ce8d1e1174e66536d59d8d97eb2cc8ce6f25. Conflicts: railties/lib/rails/application/configuration.rb railties/lib/rails/application/finisher.rb railties/lib/rails/engine.rb | |||||
* | | | Merge pull request #3950 from guilleiguaran/use-https-for-rubygems-in-apps | Piotr Sarnacki | 2011-12-12 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Use rubygems https endpoint for the Gemfile on new apps | |||||
| * | | | Use rubygems https endpoint for the Gemfile on new apps | Guillermo Iguaran | 2011-12-12 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #3954 from bdurand/null_store_2 | José Valim | 2011-12-12 | 2 | -2/+10 | |
|\ \ \ \ | | | | | | | | | | | Add ActiveSupport::Cache::NullStore for testing and development | |||||
| * | | | | Add ActiveSupport::Cache::NullStore to expose caching interface without ↵ | Brian Durand | 2011-12-12 | 2 | -2/+10 | |
| |/ / / | | | | | | | | | | | | | actually caching for development and test environments. | |||||
* | | | | Speed up development by only reloading classes if dependencies files changed. | José Valim | 2011-12-12 | 10 | -47/+95 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be turned off by setting `config.reload_classes_only_on_change` to false. Extensions like Active Record should add their respective files like db/schema.rb and db/structure.sql to `config.watchable_files` if they want their changes to affect classes reloading. Thanks to https://github.com/paneq/active_reload and Pastorino for the inspiration. <3 | |||||
* | | | | strip whitespace errors from the generated Gemfile | Aaron Patterson | 2011-12-12 | 2 | -1/+11 | |
|/ / / | ||||||
* | | | Default relative_url_root to ENV["RAILS_RELATIVE_URL_ROOT"]. Fixes #3365 | Piotrek Okoński | 2011-12-12 | 2 | -1/+11 | |
| | | | ||||||
* | | | Give hooks the flexibility to choose the type of callback. | José Valim | 2011-12-12 | 2 | -13/+13 | |
| | | | ||||||
* | | | Provide a unique point for running initializers. | José Valim | 2011-12-12 | 4 | -9/+13 | |
| | | | ||||||
* | | | Improve docs for Rails::Application and add routes_reloader_hook and ↵ | José Valim | 2011-12-12 | 3 | -29/+77 | |
| | | | | | | | | | | | | app_reloader_hooks. | |||||
* | | | Composition > inheritance. | José Valim | 2011-12-12 | 1 | -3/+11 | |
| | | | ||||||
* | | | update command line guide: generated README is now an rdoc | Vijay Dev | 2011-12-11 | 1 | -3/+3 | |
| | | | ||||||
* | | | Merge pull request #3936 from ↵ | Yehuda Katz | 2011-12-11 | 3 | -0/+13 | |
|\ \ \ | | | | | | | | | | | | | | | | | guilleiguaran/skip-assets-options-when-sprockets-skipped Skip assets options in environments files when --skip-sprockets is used | |||||
| * | | | Skip assets options in environments files when --skip-sprockets is used | Guillermo Iguaran | 2011-12-11 | 3 | -0/+13 | |
| | | | | ||||||
* | | | | revising doc | Vijay Dev | 2011-12-11 | 1 | -3/+1 | |
|/ / / | ||||||
* | | | Ensure that files that compile to js/css are not compiled by default with ↵ | Piotr Sarnacki | 2011-12-11 | 1 | -2/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | `rake assets:precompile` This case was not tested and documentation was a bit confusing on that topic, so it was not obvious if current code works properly or not. | |||||
* | | | Clarify the default assets.precompile matcher behavior | Piotr Sarnacki | 2011-12-11 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge pull request #3925 from guilleiguaran/extra-test-for-therubyrhino | Yehuda Katz | 2011-12-09 | 1 | -1/+5 | |
|\ \ \ | | | | | | | | | Add test to verify that therubyrhino isn't included when JRuby isn't used | |||||
| * | | | Add test to verify that therubyrhino isn't included when JRuby isn't used | Guillermo Iguaran | 2011-12-09 | 1 | -1/+5 | |
| | | | | ||||||
* | | | | Skip assets groups if --skip-sprockets option is given | Guillermo Iguaran | 2011-12-09 | 2 | -0/+6 | |
|/ / / | ||||||
* | | | revises some stuff that was out of sync with the recent generated README.rdoc | Xavier Noria | 2011-12-10 | 2 | -1/+1 | |
| | | | ||||||
* | | | * ActiveSupport::BufferedLogger#silence is deprecated. If you want to squelch | Aaron Patterson | 2011-12-09 | 1 | -3/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | logs for a certain block, change the log level for that block. * ActiveSupport::BufferedLogger#open_log is deprecated. This method should not have been public in the first place. * ActiveSupport::BufferedLogger's behavior of automatically creating the directory for your log file is deprecated. Please make sure to create the directory for your log file before instantiating. * ActiveSupport::BufferedLogger#auto_flushing is deprecated. Either set the sync level on the underlying file handle like this: f = File.open('foo.log', 'w') f.sync = true ActiveSupport::BufferedLogger.new f Or tune your filesystem. The FS cache is now what controls flushing. * ActiveSupport::BufferedLogger#flush is deprecated. Set sync on your filehandle, or tune your filesystem. | |||||
* | | | Add the .rdoc extension to the README that Rails generates for a new application | Steve Richert | 2011-12-09 | 2 | -4/+4 | |
| | | | ||||||
* | | | Fix indentation | Piotr Sarnacki | 2011-12-09 | 1 | -67/+67 | |
| | | | ||||||
* | | | Allow to run migrations with given scope, with SCOPE=<scope> | Piotr Sarnacki | 2011-12-09 | 1 | -0/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scope in migrations can be defined by adding suffix in filename, like: 01_a_migration.blog.rb. Such migration have blog scope. Scope is automatically added while copying migrations from engine, so if you want to revert all of the migrations from given engine, you can just run db:migrate with SCOPE, like: rake db:migrate SCOPE=blog | |||||
* | | | Add suffix for migrations copied from engines | Piotr Sarnacki | 2011-12-09 | 1 | -6/+6 | |
| | | | ||||||
* | | | Fix railties tests, identical migrations are not considered when copying | Piotr Sarnacki | 2011-12-09 | 1 | -0/+2 | |
| | | | ||||||
* | | | fix nodocs | Vijay Dev | 2011-12-09 | 1 | -1/+1 | |
| | | | ||||||
* | | | add haml and slim to the list of extensions supported by rake notes | Vijay Dev | 2011-12-09 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #3908 from kennyj/should_use_default_charset | José Valim | 2011-12-08 | 1 | -2/+3 | |
|\ \ \ | | | | | | | | | Fix a failure in railties on ruby 1.8.x | |||||
| * | | | Fix testcase an error on ruby 1.8.x. | kennyj | 2011-12-09 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | In Ruby 1.8.x, config.encoding sets $KCODE. Therefore, the possible values are UTF8, SJIS, or EUC. And, if we set SJIS, we'll has the error. Because some rails sources are written in utf-8 encoding. | |||||
* | | | | Merge pull request #3888 from kennyj/should_use_default_charset | José Valim | 2011-12-08 | 1 | -0/+6 | |
|\| | | | | | | | | | | | Assign config.encoding to AD::Response.default_charset at the initialization time. | |||||
| * | | | Assign config.encoding to AD::Response.default_charset at the initialization ↵ | kennyj | 2011-12-07 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | time. | |||||
* | | | | Moves migrations tests from railties/test/application/rake_test.rb to ↵ | Kazimierz Kiełkowicz | 2011-12-07 | 2 | -68/+85 | |
| | | | | | | | | | | | | | | | | railties/test/application/rake/migrations_test.rb | |||||
* | | | | Move rake notes test to railties/test/application/rake/notes_test.rb | Kazimierz Kiełkowicz | 2011-12-07 | 2 | -42/+45 | |
| | | | | ||||||
* | | | | Update source_annotation_extractor comment. | Kazimierz Kiełkowicz | 2011-12-07 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Add annotation to haml and slim template. | Kazimierz Kiełkowicz | 2011-12-07 | 2 | -0/+46 | |
| |/ / |/| | | ||||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-12-06 | 5 | -13/+17 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | use textile syntax in links | Vijay Dev | 2011-12-06 | 1 | -1/+1 | |
| | | | ||||||
| * | | rxml and rhtml are no longer searched for source code annotations | Vijay Dev | 2011-12-06 | 1 | -1/+1 | |
| | | | ||||||
| * | | copy edits in layouts guide, change links to be relative | Vijay Dev | 2011-12-06 | 1 | -6/+6 | |
| | | | ||||||
| * | | Added git --rebase option for pulling rails master | Thomas von Deyen | 2011-12-06 | 1 | -1/+1 | |
| | | | ||||||
| * | | Added wiki link to REST | sandeepravi | 2011-12-06 | 1 | -1/+1 | |
| | | | ||||||
| * | | Added wiki link for REST | sandeepravi | 2011-12-06 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' of github.com:lifo/docrails | Sergey Parizhskiy | 2011-12-05 | 1 | -1/+1 | |
| |\ \ | ||||||
| | * | | Remove redundant or | Jason Noble | 2011-12-05 | 1 | -1/+1 | |
| | | | |