aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Honor distinct option when used with count operation after group clause ↵Marcelo Giorgi2010-10-112-4/+17
| | | | [#5721 state:resolved]
* data-disable-with in button_to helperPaco Guzman2010-10-112-0/+27
| | | | | | [#4993 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* reorder removed in favor of except(:order).orderSantiago Pastorino2010-10-116-36/+5
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-10-115-9/+8
|\
| * Revert "Add missing CHANGELOG entry about reset_javascript_include_default"Xavier Noria2010-10-111-2/+0
| | | | | | | | | | | | | | | | | | This reverts commit 234a4ca7ddb7794a92f266af48fd38edbdb03003. Reason: No big deal Ryan, only there's a very strict policy in docrails which allows public write access on the other hand. CHANGELOGs can only be edited in master. If this is added I'll make sure you get the credit for the patch.
| * I corrected a code snippet typo in the ↵Philip R. Dutton2010-10-111-1/+1
| | | | | | | | railties/guides/source/initialization.textile file [#5779 state:resolved]
| * Add missing CHANGELOG entry about reset_javascript_include_defaultRyan Bigg2010-10-111-0/+2
| |
| * Remove mention to register_javascript_include_default in documentationRyan Bigg2010-10-112-6/+0
| |
| * Fix typo 'configation' [#5575 state:resolved]Utkarsh Kukreti2010-10-111-1/+1
| |
| * Updated RUNNING_UNIT_TESTS documentation with mention of the build_databases ↵Nathan Zook and Ryan Bigg2010-10-111-1/+6
| | | | | | | | rake tasks.
* | Updated DOCS for engines and added a couple TODOs. Also, commented internal ↵José Valim2010-10-113-36/+50
| | | | | | | | railties rake tasks description.
* | Revert "Make InstanceTagMethods#value_before_type_cast raise if the model ↵Santiago Pastorino2010-10-102-38/+3
| | | | | | | | | | | | | | | | don't respond to attr_before_type_cast or attr method" And "Makes form_helper use overriden model accessors" This reverts commit 3ba8e3100548f10fce0c9784981a4589531476dd and fb0bd8c1092db51888ec4bb72af6c595e13c31fa.
* | Always pull in version for frameworks (standardize autoload / require / none)wycats2010-10-105-5/+6
| |
* | Make ActiveSupport load own version.Barry Sears2010-10-101-0/+1
| | | | | | | | | | | | [#5739 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Do not allow templates coming from Fallback resolvers to store a virtual path.José Valim2010-10-105-4/+29
| |
* | Use identifiers for template equality.José Valim2010-10-105-10/+46
| |
* | Fix misleading advice to add 'memcache' to GemfileWincent Colaiuta2010-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#5539 state:committed] Commit 57144388f removed the hard-coded dependency on the memcache-client gem, and added this warning advising people to install it if needed. The problem is, however, that if people follow the advice literally and install the 'memcache' gem, they will wind up with a completely different thing, which is not API compatible with the memcache-client gem and which Rails can't work with. So, be explicit and tell users to install the 'memcache-client' gem. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Override #store to be consistent with #[].Andrea Campi2010-10-102-0/+12
| | | | | | | | | | | | [#5775 state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Merge remote branch 'drogus/engines'José Valim2010-10-1014-90/+205
|\ \
| * | Add 'foo:install:migrations' task to copy migrations from foo enginePiotr Sarnacki2010-10-092-1/+15
| | |
| * | Load rake tasks defined in superclasses in context of railtiesPiotr Sarnacki2010-10-092-0/+31
| | |
| * | Rename rake railties:copy_migrations to rake railties:install:migrations and ↵Piotr Sarnacki2010-10-092-33/+42
| | | | | | | | | | | | fix it to work with new copying strategy
| * | Add callback on skipped migration while copying migrationsPiotr Sarnacki2010-10-092-9/+40
| | |
| * | Change the method for copying migrations, do not add scope.Piotr Sarnacki2010-10-096-30/+60
| | | | | | | | | | | | | | | | | | | | | The purpose of this change is to allow copying fail on the same names. Migrations change database and they should be treated with caution, if 2 migrations are named the same it's much better to skip migration and allow user decide if it should be copied or not.
| * | Rename namespace method to isolate_namespace.Piotr Sarnacki2010-10-094-21/+21
| | | | | | | | | | | | | | | | | | | | | This change caused by confusion caused by calling engine "namespaced". Stuff inside engine can be namespaced for every engine. This method is not actually namespacing anything, it's isolating engine within the given namespace.
* | | Clean up unused methods from AV::Base and pass in the template object on ↵José Valim2010-10-106-31/+33
| | | | | | | | | | | | rendering.
* | | Add expire! and rerender to the template API. This will be used by SASS ↵José Valim2010-10-102-5/+67
| | | | | | | | | | | | template handler.
* | | Add some unit tests to Template#refresh.José Valim2010-10-101-4/+28
| | |
* | | Update CHANGELOG.José Valim2010-10-103-2/+12
| | |
* | | Add support to render :once.José Valim2010-10-106-29/+139
| | | | | | | | | | | | This will be used internally by sprockets to ensure requires are executed just once.
* | | Clean up the house before moving in the new furniture.José Valim2010-10-1010-306/+348
| | | | | | | | | | | | This commit moves all the template rendering logic that was hanging around AV::Base to renderer objects.
* | | prevent rake test to run the test suite three times when ENV['TEST'] is set ↵David Calavera2010-10-102-6/+14
| | | | | | | | | | | | | | | | | | [#3572 state:resolved] Signed-off-by: Xavier Noria <fxn@hashref.com>
* | | Rendering doesn't need RackDelegationwycats2010-10-101-1/+0
| | |
* | | Fix a few bugs when trying to use Head standalonewycats2010-10-104-4/+23
| | |
* | | Resolvers now consider timestamps.José Valim2010-10-104-35/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this patch, every request in development caused the template to be compiled, regardless if it was updated in the filesystem or not. This patch now checks the timestamp and only compiles it again if any change was done. While this probably won't show any difference for current setups, but it will be useful for asset template handlers (like SASS), as compiling their templates is slower than ERb, Haml, etc.
* | | Deprecate old template handler API. Remove old handlers.José Valim2010-10-1023-59/+64
| | |
* | | Add more docs and tests to templates.José Valim2010-10-092-41/+66
|/ /
* | Fix error in routing guide edit_photo_path needs the id as paramSantiago Pastorino2010-10-091-1/+1
| |
* | This test is not only testing config/database stuff anymoreSantiago Pastorino2010-10-091-1/+1
| |
* | test that skip active records does not load fixturesAditya Sanghi2010-10-091-0/+3
| | | | | | | | | | | | [#4104 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Test if test/performance/browsing_test.rb exists when --skip-activerecord is ↵Santiago Pastorino2010-10-091-0/+1
| | | | | | | | | | | | used [#4104]
* | Fix example that became outdated after a code change.Andrea Campi2010-10-091-1/+1
| | | | | | | | | | | | [#5770 state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Fixing two minor errors in Rails::Generators::Actions initializer method ↵Juan Maiz2010-10-081-2/+2
| | | | | | | | | | | | | | | | comments [#5771 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Refactor resource action scope methodsAndrew White2010-10-081-38/+20
| |
* | Remove old workaround for mocha bug. [#3886 state:committed]James Mead2010-10-081-4/+1
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Makes this code a bit more clearSantiago Pastorino2010-10-081-3/+3
| |
* | Remove the final initializers since initializers += will return it anyway. ↵Ryan Bigg2010-10-081-1/+0
| | | | | | | | | | | | [#3892 state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Fix engines testPiotr Sarnacki2010-10-081-1/+3
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* | Refactored routes reloading to use RouteSet#append instead keeping block in ↵Piotr Sarnacki2010-10-082-23/+9
| | | | | | | | | | | | Engine Signed-off-by: José Valim <jose.valim@gmail.com>
* | Cleanup logger a bit.José Valim2010-10-081-38/+11
| |