aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Missing requires addedSantiago Pastorino2010-04-201-0/+3
| | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
* Regexp.escape(load_path) in add_routing_namespaces initializer [#4442 ↵Phil Smith2010-04-201-1/+1
| | | | | | state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com>
* test refactorSantiago Pastorino2010-04-191-2/+8
|
* Make this test pass on > 1.9Santiago Pastorino2010-04-191-1/+5
|
* Rails on Rack Rails guide: indicate that Metal pieces now require an ↵Cheah Chu Yeow2010-04-191-17/+5
| | | | "X-Cascade" header with a value of "pass" to continue the Metal chain execution instead of a HTTP 404 response. Also removed reference to old code.
* Fixes to the getting started guideRohit Arondekar2010-04-191-6/+6
|
* much complete rdoc for String#ordXavier Noria2010-04-191-3/+19
|
* revises the rdoc of String#ordXavier Noria2010-04-191-1/+5
|
* AS guide: AS no longer extends PathnameXavier Noria2010-04-191-4/+0
|
* fix testing guide: fonts and code formateparreno2010-04-191-15/+15
|
* MemoryStore#read_multi(*keys) for dev-mode compatibility with memcache storeJeremy Kemper2010-04-192-1/+14
|
* Make the migration generator handle pre-existing migrations with the same ↵Phil Smith2010-04-192-2/+16
| | | | | | | | | | timestamp. In the event a migration already exists with that number, the new migration's timestamp will be incremented by 1. [#4412 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Merge remote branch 'spastorino/master'Carl Lerche2010-04-185-15/+6
|\
| * Missing require addedSantiago Pastorino2010-04-181-0/+1
| |
| * remove code for Ruby < 1.8.7Santiago Pastorino2010-04-181-12/+0
| |
| * Missing require addedSantiago Pastorino2010-04-181-0/+1
| |
| * perform_caching should be accessed through the controller hereSantiago Pastorino2010-04-171-1/+1
| |
| * perform_caching is now delegated to config on instance and class levelSantiago Pastorino2010-04-171-2/+3
| |
* | Merge branch 'master' of github.com:rails/railsCarl Lerche2010-04-1818-30/+168
|\|
| * added shorthand support for routes like /projects/status(.:format)Diego Carrion2010-04-173-3/+14
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * removes code written for Ruby < 1.8.7Xavier Noria2010-04-172-19/+0
| |
| * access assigns as a method or hash, with strings or symbols [#4431 ↵David Chelimsky2010-04-172-2/+18
| | | | | | | | state:resolved]
| * fisting codes so it will parse [#4430 state:resolved]Aaron Patterson2010-04-171-2/+2
| | | | | | | | Signed-off-by: wycats <wycats@gmail.com>
| * Make i18n fallbacks configurable and fallback to the default locale by ↵Sven Fuchs2010-04-173-0/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default in production [#4428 state:resolved] Allows to configure locale fallbacks through config.i18n.fallbacks. The default setting config.i18n.fallbacks = true in production.rb will make I18n.t lookup fallback to the I18n.default_locale if a translation could not be found for the current or given locale. config.fallbacks = true config.fallbacks.map = { :ca => :es } config.fallbacks.defaults = [:'es-ES', :es] config.fallbacks = [:'es-ES', :es] config.fallbacks = { :ca => :es } config.fallbacks = [:'es-ES', :es, { :ca => :es }] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * working around syck defects by optionally matching a space [#4426 ↵Aaron Patterson2010-04-171-1/+1
| | | | | | | | | | | | state:resolved] Signed-off-by: wycats <wycats@gmail.com>
| * making yaml tests less specific to emitter. [#4425 state:resolved]Aaron Patterson2010-04-171-1/+2
| | | | | | | | Signed-off-by: wycats <wycats@gmail.com>
| * fixing invalid yaml [#4424 state:resolved]Aaron Patterson2010-04-171-1/+2
| | | | | | | | Signed-off-by: wycats <wycats@gmail.com>
| * Added missing requireSantiago Pastorino2010-04-161-0/+1
| |
| * avoid warning: ambiguous first argument; put parentheses or even spacesSantiago Pastorino2010-04-161-1/+1
| |
| * Missing requireswycats2010-04-162-0/+2
| |
* | mail_to with :encode => :javascript now outputs safe htmlSam Elliott2010-04-162-3/+7
|/ | | | Signed-off-by: Carl Lerche <carllerche@mac.com>
* Revert "Avoid deprecation warnings and potential TypeErrors [#4404 ↵Carl Lerche2010-04-163-4/+3
| | | | | | | state:resolved]" Revert "protected instance variables added to the deprecated config accessor This reverts commit 4bce5ba600596b5e7afec9b097866ac259c5940a and 0ee2d3c89a893f0c53924cbb756c7e9be616eb8f.
* Merge commit 'docrails/master'Xavier Noria2010-04-164-488/+60
|\
| * Fixing up some errors and changing the observer pattern to a much more ↵Mikel Lindsaar2010-04-171-27/+32
| | | | | | | | simple and direct controller pattern
| * Added a note in the section on complex forms regarding nested attributes in 2.3Jared Giles2010-04-151-0/+1
| |
| * fix ActionController font and replace extract_locale_from_uri with ↵eparreno2010-04-151-3/+3
| | | | | | | | extract_locale_from_tld
| * Revert "I18n guide: change ActionController by Action Controller in some ↵Xavier Noria2010-04-151-4/+4
| | | | | | | | | | | | places and fix code example in 2.4 section" This reverts commit 002da9b6eab67323270dc8e7ea34fe72b3397b98.
| * I18n guide: change ActionController by Action Controller in some places and ↵eparreno2010-04-141-4/+4
| | | | | | | | fix code example in 2.4 section
| * Begun documenting YourApp::Application and how it ties in with the backend.Ryan Bigg2010-04-141-0/+43
| |
| * Rip out bundler notes, they're now living at ↵Ryan Bigg2010-04-141-550/+3
| | | | | | | | http://github.com/radar/how-rails-works/raw/master/bundler.textile. It really needs its own guide.
| * More expansion on Bundler internals.Ryan Bigg2010-04-141-6/+76
| |
* | Mark the result of grouped_options_for_select as HTML safe [#4322 ↵Kieran Pilkington2010-04-162-1/+5
| | | | | | | | | | | | state:committed] Signed-off-by: Xavier Noria <fxn@hashref.com>
* | Add missing requireSantiago Pastorino2010-04-161-0/+1
| |
* | Bump rack-mount dependency to ~> 0.6.3 for CRITICAL FIXJeremy Kemper2010-04-162-3/+3
| |
* | fixing invalid yaml [#4418 state:resolved]Aaron Patterson2010-04-161-1/+4
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Revert "Require rack-mount 0.6.0 since 0.6.1 and later can't be bundled"Jeremy Kemper2010-04-162-3/+3
| | | | | | | | | | | | They can be bundled. Just the git repos can't. Use rails/rack-mount for that. This reverts commit ef6cdc974f7c3d98eb0a3ad65761e10600f04110.
* | Fix Active Model observer testsJeremy Kemper2010-04-162-2/+4
| |
* | improve how ActiveRecord::Observer defines callbacks on observed modelsMislav Marohnić2010-04-162-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using a single `notify_observers` call for every callback type, each observer now registers a unique callback for itself. Example: before_save :_notify_user_observer_for_before_save def _notify_user_observer_for_before_save observer.update(:before_save, self) end Benefit: "before" callbacks halt when `observer.update` returns false. This way, ActiveRecord observers can prevent records from saving. [#4087 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | ActiveModel::Observing: stop using Observable Ruby module, re-implement ↵Mislav Marohnić2010-04-162-7/+36
| | | | | | | | | | | | | | | | | | `notify_observers` `Observable#notify_observers` from Ruby always returns false (which halts ActiveRecord callback chains) and has extra features (like `changed`) that were never used. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | merge callbacks_observers_test.rb into lifecycle_test.rb where other ↵Mislav Marohnić2010-04-162-37/+34
| | | | | | | | | | | | | | | | observers test reside Benefits: test able to run independently, subclassing instead of changing the original Comment model Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>