Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git@github.com:lifo/docrails | Aditya Chadha | 2009-04-27 | 6 | -77/+91 |
|\ | |||||
| * | Removed reference in documentation of form_authenticity_token to deprecated ↵ | Luke Amdor | 2009-04-27 | 1 | -2/+1 |
| | | | | | | | | :secret option of protect_from_forgery | ||||
| * | fixes an example from the previous commit | Xavier Noria | 2009-04-27 | 1 | -2/+2 |
| | | |||||
| * | adds timestamps in examples of generated asset paths, and documents this bit ↵ | Xavier Noria | 2009-04-27 | 1 | -69/+72 |
| | | | | | | | | in a few helpers | ||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Dallas Taylor | 2009-04-27 | 3 | -5/+18 |
| |\ | |||||
| | * | Made a minor syntax correction. | Sean Schofield | 2009-04-27 | 1 | -1/+1 |
| | | | |||||
| | * | Add documentation for respond_to's any method | Ryan Bigg | 2009-04-27 | 1 | -0/+12 |
| | | | |||||
| | * | bring index actions back in caching guide, REST conventions are encouraged ↵ | Xavier Noria | 2009-04-27 | 1 | -4/+4 |
| | | | | | | | | | | | | and surrounding text assumes index | ||||
| * | | fixed typo and clarified sentence | Dallas Taylor | 2009-04-27 | 1 | -1/+1 |
| | | | |||||
* | | | Formatting updates per lifo | Aditya Chadha | 2009-04-27 | 1 | -12/+10 |
| |/ |/| | |||||
* | | Fix typos in submitted patch | Aditya Chadha | 2009-04-26 | 1 | -8/+9 |
|/ | |||||
* | Minor changes to scaffold code, addition of dependent destroy example. | Dana Jones | 2009-04-25 | 1 | -14/+28 |
| | |||||
* | Better wording of environment.rb example code, thanks Paul Gillard | Karel Minarik | 2009-04-25 | 1 | -1/+1 |
| | | | | See https://rails.lighthouseapp.com/projects/16213/tickets/23-rails-i18 | ||||
* | Consolidate `config/locale` vs `config/locales` issue. [#16213] | Karel Minarik | 2009-04-25 | 1 | -5/+5 |
| | |||||
* | Merge commit 'mainstream/master' | Pratik Naik | 2009-04-23 | 124 | -398/+696 |
|\ | |||||
| * | * Add pluggable JSON backends with support for the JSON gem. [rick] | rick | 2009-04-23 | 32 | -239/+384 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: ActiveSupport::JSON.backend = "JSONGem" All internal Rails JSON encoding is now handled by ActiveSupport::JSON.encode(). Use of #to_json is not recommended, as it may clash with other libraries that overwrite it. However, you can recover Rails specific functionality if you really want to use #to_json. gem 'json' ActiveSupport::JSON.backend = "JSONGem" class ActiveRecord::Base alias to_json rails_to_json end | ||||
| * | Removed rest of Symbol#to_proc from railties tests | Jeremy Kemper | 2009-04-22 | 2 | -3/+3 |
| | | |||||
| * | Missed one | Jeremy Kemper | 2009-04-22 | 1 | -1/+1 |
| | | |||||
| * | Remove Symbol#to_proc dependency | Jeremy Kemper | 2009-04-22 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-04-22 | 26 | -114/+165 |
| |\ | |||||
| | * | Refactor ActionView::Path | Yehuda Katz + Carl Lerche | 2009-04-22 | 26 | -114/+165 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Decouple from ActionController and ActionMailer * Bring back localization support. * Prepare to decouple templates from the filesystem. * Prepare to decouple localization from ActionView * Fix ActionMailer to take advantage of ActionView::Path | ||||
| * | | Fix dependencies revealed by testing in isolation | Jeremy Kemper | 2009-04-22 | 61 | -32/+127 |
| | | | |||||
| * | | new_callbacks core extensions | Jeremy Kemper | 2009-04-22 | 2 | -5/+8 |
| |/ | |||||
| * | Fix tests on 1.9 | Jeremy Kemper | 2009-04-22 | 4 | -2/+6 |
| | | |||||
* | | String interpolation conditions | Pratik Naik | 2009-04-23 | 1 | -0/+11 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-04-23 | 220 | -4046/+3985 |
|\| | |||||
| * | Merge branch 'master' into cherry | Jeremy Kemper | 2009-04-22 | 5 | -1/+7 |
| |\ | | | | | | | | | | | | | Conflicts: activesupport/lib/active_support.rb | ||||
| | * | Opt in to JSON | Jeremy Kemper | 2009-04-22 | 5 | -1/+7 |
| | | | |||||
| * | | Opt in to Dependencies | Jeremy Kemper | 2009-04-22 | 10 | -10/+19 |
| |/ | |||||
| * | No more free lunch | Jeremy Kemper | 2009-04-22 | 14 | -21/+38 |
| | | |||||
| * | stdlib autoloads were hanging on 1.9.1 | Jeremy Kemper | 2009-04-22 | 3 | -9/+6 |
| | | |||||
| * | Get Active Model in the mix | Jeremy Kemper | 2009-04-22 | 1 | -1/+1 |
| | | |||||
| * | Divert CoreExtensions mention in docs | Jeremy Kemper | 2009-04-22 | 1 | -1/+1 |
| | | |||||
| * | Convert string extension modules to class reopens | Jeremy Kemper | 2009-04-22 | 6 | -291/+247 |
| | | |||||
| * | ActiveSupport.core_ext bridge util no longer used | Jeremy Kemper | 2009-04-22 | 1 | -10/+0 |
| | | |||||
| * | Switch last module core extension to class reopen | Jeremy Kemper | 2009-04-22 | 2 | -21/+6 |
| | | |||||
| * | Merge branch 'master' into cherry | Jeremy Kemper | 2009-04-22 | 6 | -18/+96 |
| |\ | |||||
| | * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-04-22 | 4 | -16/+80 |
| | |\ | |||||
| | | * | Fix test_rescue_routing_exceptions when running with rake | Joshua Peek | 2009-04-21 | 1 | -13/+15 |
| | | | | |||||
| | | * | refactor some coupled rescue tests | Joshua Peek | 2009-04-21 | 1 | -16/+78 |
| | | | | |||||
| | | * | Session tests belong under dispatch folder | Joshua Peek | 2009-04-21 | 3 | -0/+0 |
| | | | | |||||
| | * | | Rack::Utils.body_to_s doesn't exist in 1.0 | Jeremy Kemper | 2009-04-22 | 2 | -2/+16 |
| | |/ | |||||
| * | | Merge branch 'master' into cherry | Jeremy Kemper | 2009-04-21 | 15 | -331/+536 |
| |\| | |||||
| | * | Reinstate Base#render_to_string. Introduce ↵ | Jeremy Kemper | 2009-04-21 | 3 | -6/+38 |
| | | | | | | | | | | | | AbstractController#render_to_string which stringifies render_to_body. | ||||
| | * | Add microsecond support for sqlite adapter [#1982 state:resolved] | Alex Pooley | 2009-04-21 | 2 | -1/+11 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| | * | Update rails:template task to expand file paths [#2528 state:resolved] | Stephen Celis | 2009-04-21 | 1 | -1/+3 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| | * | Fix nginx config in ci setup notes [Chad Woolley] [#2290 state:resolved] | Pratik Naik | 2009-04-21 | 1 | -4/+13 |
| | | | |||||
| | * | Remove excess mocking from polymorphic_url tests [#2330 state:resolved] | Mike Gunderloy | 2009-04-21 | 2 | -293/+394 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| | * | Change table to prevent copying indexes on sqlite2 | Pratik Naik | 2009-04-21 | 1 | -5/+5 |
| | | | |||||
| | * | Specify :group with the table name for it to work on sqlite3 | Pratik Naik | 2009-04-21 | 1 | -1/+1 |
| | | |