Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add missing changelog entries for actionpack | Guillermo Iguaran | 2011-09-13 | 1 | -0/+4 |
| | |||||
* | Merge pull request #3011 from guilleiguaran/disable-sprockets-server | Santiago Pastorino | 2011-09-13 | 2 | -3/+17 |
|\ | | | | | Don't mount Sprockets if config.assets.compile is disabled | ||||
| * | Fix broken asset test | Guillermo Iguaran | 2011-09-13 | 1 | -2/+2 |
| | | |||||
| * | Don't mount Sprockets at config.assets.prefix if config.assets.compile is false. | Mark J. Titorenko | 2011-09-13 | 2 | -2/+16 |
|/ | |||||
* | Stop trying to be clever about when to define attribute methods. | Jon Leighton | 2011-09-14 | 2 | -34/+1 |
| | | | | | | | | | There is no meaningful performance penalty in defining attribute methods, since it only happens once. There is also no reason *not* to define them, since they get thrown in an included module, so they will not 'overwrite' anything. In fact, this is desirable, since it allows us to call super. | ||||
* | Generate attribute method unless it's already in the module. | Jon Leighton | 2011-09-14 | 2 | -1/+24 |
| | | | | | | | There's no harm in generating a method name that's already defined on the host class, since we're generating the attribute methods in a module that gets included. In fact, this is desirable as it allows the host class to call super. | ||||
* | We don't need to build a set for DangerousAttributeError. | Jon Leighton | 2011-09-14 | 1 | -7/+13 |
| | | | | We can just use method_defined? and private_method_defined? | ||||
* | Provide a way to access to assets without using the digest, useful for ↵ | Santiago Pastorino | 2011-09-13 | 3 | -0/+6 |
| | | | | static files and emails | ||||
* | Rename first_or_new to first_or_initialize. | Jon Leighton | 2011-09-13 | 5 | -28/+15 |
| | | | | | For consistency with find_or_initialize_by. Also remove first_or_build alias. | ||||
* | delete stray backup files from guides sample app | Vijay Dev | 2011-09-13 | 2 | -62/+0 |
| | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-09-13 | 7 | -83/+15 |
|\ | |||||
| * | Fixed markup error. | 45north | 2011-09-13 | 1 | -1/+1 |
| | | |||||
| * | Fix typo | Mike Gunderloy | 2011-09-13 | 1 | -1/+1 |
| | | |||||
| * | getting_started.textile: Fix typo and split up a sentence in section ↵ | dharmatech | 2011-09-12 | 1 | -2/+2 |
| | | | | | | | | "Building a Multi-Model Form" | ||||
| * | Merge pull request #67 from alanzeino/master | Vijay Dev | 2011-09-12 | 1 | -2/+2 |
| |\ | | | | | | | 'Getting Started' guide typo fix | ||||
| | * | Slight change to reflect current 'destroy' code generated by scaffold in 3.1 ↵ | Alan Zeino | 2011-09-12 | 1 | -2/+2 |
| | | | | | | | | | | | | release. | ||||
| * | | Delete contribute.textile now that its contents are merged to the ↵ | Vijay Dev | 2011-09-12 | 1 | -70/+0 |
| | | | | | | | | | | | | contributing_to_ruby_on_rails guide | ||||
| * | | change GH issue tracker url | Vijay Dev | 2011-09-12 | 1 | -1/+1 |
| | | | |||||
| * | | getting_started.textile: Fix typos in section "Rendering a Partial Form" | dharmatech | 2011-09-12 | 1 | -1/+1 |
| | | | |||||
| * | | Fix a typo in date | Semyon Perepelitsa | 2011-09-12 | 1 | -1/+1 |
| |/ | |||||
| * | merged the contribution guides and changed the | Vijay Dev | 2011-09-11 | 2 | -5/+7 |
| | | | | | | | | link in the layout accordingly | ||||
* | | Fix asset_path relative_url_root method | Santiago Pastorino | 2011-09-13 | 2 | -7/+5 |
| | | |||||
* | | Merge pull request #3001 from guilleiguaran/fix-assets-precompile-host-test | Santiago Pastorino | 2011-09-13 | 1 | -1/+1 |
|\ \ | | | | | | | Fix precompile asset_host test | ||||
| * | | Fix precompile asset_host test | Guillermo Iguaran | 2011-09-13 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #3000 from guilleiguaran/fix-relative-url-root | Santiago Pastorino | 2011-09-13 | 1 | -4/+2 |
|\ \ | | | | | | | Fix for relative url root in assets | ||||
| * | | Fix for relative url root in assets | Guillermo Iguaran | 2011-09-13 | 1 | -4/+2 |
|/ / | |||||
* | | Merge pull request #2996 from guilleiguaran/move-assets-tests | Santiago Pastorino | 2011-09-13 | 2 | -31/+31 |
|\ \ | | | | | | | Move asset tests to assets_test file | ||||
| * | | Move asset tests to assets_test file | Guillermo Iguaran | 2011-09-13 | 2 | -31/+31 |
| | | | |||||
* | | | always rewrite_relative_url_root | Santiago Pastorino | 2011-09-13 | 2 | -6/+2 |
|/ / | |||||
* | | Merge pull request #2993 from deepakprasanna/generator_test_fix | Santiago Pastorino | 2011-09-12 | 1 | -1/+1 |
|\ \ | | | | | | | fixed the failing generators_test in railties. | ||||
| * | | fixed the failing generators_test | Deepak Prasanna | 2011-09-13 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #2977 from guilleiguaran/fix-relative-root-in-assets | Santiago Pastorino | 2011-09-12 | 3 | -3/+22 |
|\ \ | | | | | | | Set relative url root in assets when controller isn't available for Sprockets | ||||
| * | | Set relative url root in assets when controller isn't available for ↵ | Guillermo Iguaran | 2011-09-13 | 3 | -3/+22 |
| | | | | | | | | | | | | | | | | | | Sprockets. Fix #2435 See https://github.com/rails/sass-rails/issues/42 for details | ||||
* | | | Merge pull request #2987 from kennyj/master | Santiago Pastorino | 2011-09-12 | 2 | -0/+19 |
|\ \ \ | | | | | | | | | fix https://github.com/rails/rails/issues/2947 (with testcase) | ||||
| * | | | fix https://github.com/rails/rails/issues/2947 (with testcase) | kennyj | 2011-09-13 | 2 | -0/+19 |
| | | | | |||||
* | | | | removing backwards compatibility module | Aaron Patterson | 2011-09-12 | 3 | -9/+8 |
| | | | | |||||
* | | | | point rails at Journey for dev and edge | Aaron Patterson | 2011-09-12 | 2 | -0/+3 |
| | | | | |||||
* | | | | partially expand the parameters to `match` | Aaron Patterson | 2011-09-12 | 1 | -3/+3 |
| | | | | |||||
* | | | | unfactor the Route class to private factory methods | Aaron Patterson | 2011-09-12 | 2 | -45/+42 |
| | | | | |||||
* | | | | reduce dependencies of external objects in the Route class | Aaron Patterson | 2011-09-12 | 2 | -16/+18 |
| | | | | |||||
* | | | | delete unused code, pass path explicitly to journey | Aaron Patterson | 2011-09-12 | 2 | -28/+7 |
| | | | | |||||
* | | | | adjust route inspection to work with Journey | Aaron Patterson | 2011-09-12 | 1 | -1/+2 |
| | | | | |||||
* | | | | all routes can be stored in the Journey Routes object | Aaron Patterson | 2011-09-12 | 3 | -6/+6 |
| | | | | |||||
* | | | | clear! does not need to be called from initialize | Aaron Patterson | 2011-09-12 | 1 | -4/+3 |
| | | | | |||||
* | | | | reuse the route collection and formatter by clearing them | Aaron Patterson | 2011-09-12 | 1 | -6/+10 |
| | | | | |||||
* | | | | Instantiate each part of our routing system: | Aaron Patterson | 2011-09-12 | 1 | -7/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | * A collection of Routes * The Router, which consults the collection of routes * A formatter that consults the collection of routes | ||||
* | | | | stop freezing the routes | Aaron Patterson | 2011-09-12 | 1 | -1/+0 |
| | | | | |||||
* | | | | stop using a hash for parameterizing | Aaron Patterson | 2011-09-12 | 1 | -11/+9 |
| | | | | |||||
* | | | | Switching rack-mount to journey. | Aaron Patterson | 2011-09-12 | 3 | -2/+10 |
| | | | | |||||
* | | | | Deprecate using method_missing for attributes that are columns. | Jon Leighton | 2011-09-13 | 2 | -0/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | This shouldn't ever happen unless people are doing something particularly weird, but adding a deprecation in case there are bugs not caught by our tests. |