aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3981 from choonkeat/masterJeremy Kemper2011-12-142-1/+9
|\ | | | | Fix url_for options[:subdomain] to allow objects as values
| * Fix url_for options[:subdomain] to allow objects as valueschoonkeat2011-12-142-1/+9
| | | | | | | | * e.g. blog_url(subdomain: current_user) instead of blog_url(subdomain: current_user.to_param)
* | Use a separate module for 'external' attribute methods.Jon Leighton2011-12-143-17/+26
|/
* Merge pull request #3979 from kommen/dbconsole_db_configPiotr Sarnacki2011-12-141-1/+1
|\ | | | | dbconsole: Use the app's database_configuration instead of duplicating loading code.
| * dbconsole: Use the app's database_configuration instead of duplicating code.Dieter Komendera2011-12-141-1/+1
|/
* Add return for 1.8.7Jon Leighton2011-12-141-1/+1
|
* Unfluff the CI.Jon Leighton2011-12-141-1/+1
| | | | | | | | | | | | | | | With transactional fixtures enabled, the session records would end up in @_current_transaction_records, and at the end of the transaction, methods would be called on them that would trigger method_missing and trigger attribute methods to be generated. However, at this point the sessions table would not exist, and the columns were not cached, so an exception would be raised because we can't find the columns to generate attribute methods for. Not sure exactly why this didn't crop up before but there have been changes to the schema cache code and perhaps that means that column data that was cached previously at that point is now uncached.
* Clean up details keys before some tests to expire the cache.José Valim2011-12-143-7/+9
|
* Revert naive O(1) table_exists? implementation.Jon Leighton2011-12-134-12/+16
| | | | | | | | | | It was a bad idea to rescue exceptions here. This can interfere with transaction rollbacks which seems to be the cause of current CI failure. Instead, each adapter should implement its own DB-specific O(1) implementation, and we fall back on the generic, slower, implementation otherwise.
* dup the details hash if a key has already been set for this objectAaron Patterson2011-12-131-0/+1
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-146-6/+6
|\
| * copy editsVijay Dev2011-12-141-1/+1
| |
| * typo in textile markupMikhail Dieterle2011-12-141-1/+1
| |
| * changed :finder_sql example to select * clst2011-12-121-1/+1
| | | | | | because with select p.* you can no longer use count(). Using count will result in an SQL error message.
| * fixed example for :finder_sql clst2011-12-121-1/+1
| | | | | | people.* will not work when the alias is named p
| * disambiguate "and not" when explaining "&& return"Suraj N. Kurapati2011-12-111-1/+1
| |
| * Fixing typo in Routing Guide.Ryan Sandridge2011-12-101-1/+1
| |
| * Replacing vague mention of an unspecified section above with a link to the ↵Ryan Sandridge2011-12-081-1/+1
| | | | | | | | actual section containing Asset Organization.
| * Typo in listMikhail Dieterle2011-12-081-1/+1
| |
* | Merge pull request #3970 from lest/backtrace-when-silencedJosé Valim2011-12-132-1/+17
|\ \ | | | | | | log exception backtrace when all backtrace lines silenced
| * | log exception backtrace when all backtrace lines silencedSergey Nartimov2011-12-132-1/+17
| | |
* | | locale and default_locale may be the same, so uniq the arrayAaron Patterson2011-12-131-1/+1
| | |
* | | stop freezing the details hashAaron Patterson2011-12-131-2/+1
| | |
* | | stop freezing hash valueAaron Patterson2011-12-131-1/+1
|/ /
* | Fix failing AP tests.José Valim2011-12-131-1/+1
| |
* | Merge pull request #3963 from lest/logger-missing-requireJosé Valim2011-12-131-0/+1
|\ \ | | | | | | missing require in buffered logger
| * | missing require in buffered loggerlest2011-12-131-0/+1
| | |
* | | FileUpdateChecker should be able to handle deleted files.José Valim2011-12-138-61/+109
| | |
* | | Clean up FileUpdateChecker API.José Valim2011-12-135-20/+25
|/ /
* | Move hooks back to initializers (we need an API that allows hooks to be ↵José Valim2011-12-132-36/+21
| | | | | | | | replaced).
* | Add config.file_watcher so developers can provide their own watchers (for ↵José Valim2011-12-134-8/+87
| | | | | | | | instance, hooking on fsevents).
* | Merge pull request #3958 from lest/comment-on-whitelistJosé Valim2011-12-121-0/+6
|\ \ | | | | | | commented whitelist mode enforcement for mass assignment
| * | commented whitelist mode enforcement for mass assignmentlest2011-12-131-0/+6
| | |
* | | Merge pull request #3960 from lest/activesupport-test-missing-requireJosé Valim2011-12-121-0/+1
|\ \ \ | | | | | | | | missing require in activesupport test
| * | | missing require in activesupport testlest2011-12-131-0/+1
| |/ /
* / / Revert "Provide a unique point for running initializers."José Valim2011-12-134-13/+10
|/ / | | | | | | | | | | | | | | | | | | This reverts commit c2e3ce8d1e1174e66536d59d8d97eb2cc8ce6f25. Conflicts: railties/lib/rails/application/configuration.rb railties/lib/rails/application/finisher.rb railties/lib/rails/engine.rb
* | use Array#join so that file encoding doesn't impact returned string.Aaron Patterson2011-12-122-3/+12
| | | | | | | | Fixes #3957
* | Merge pull request #3950 from guilleiguaran/use-https-for-rubygems-in-appsPiotr Sarnacki2011-12-121-1/+1
|\ \ | | | | | | Use rubygems https endpoint for the Gemfile on new apps
| * | Use rubygems https endpoint for the Gemfile on new appsGuillermo Iguaran2011-12-121-1/+1
| | |
* | | logger adds a newline for usAaron Patterson2011-12-121-1/+0
| | |
* | | use the schema cache when asking for the primary keyAaron Patterson2011-12-121-1/+1
| | |
* | | Merge pull request #3943 from sferik/add_explicit_requiresJosé Valim2011-12-122-2/+1
|\ \ \ | | | | | | | | Include TagHelper but don't explicitly require it
| * | | Include TagHelper but don't explicitly require itErik Michaels-Ober2011-12-122-2/+1
| | | | | | | | | | | | | | | | Allow autoloading to work as intended and avoid multiple requires.
* | | | Merge pull request #3954 from bdurand/null_store_2José Valim2011-12-126-8/+123
|\ \ \ \ | | | | | | | | | | Add ActiveSupport::Cache::NullStore for testing and development
| * | | | Add ActiveSupport::Cache::NullStore to expose caching interface without ↵Brian Durand2011-12-126-8/+123
| | |/ / | |/| | | | | | | | | | actually caching for development and test environments.
* | | | Speed up development by only reloading classes if dependencies files changed.José Valim2011-12-1215-58/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Provide a dir => extension API to file update checker.José Valim2011-12-122-20/+67
| | | |
* | | | strip whitespace errors from the generated GemfileAaron Patterson2011-12-122-1/+11
| | | |
* | | | Allow reloader to be configured.José Valim2011-12-122-14/+51
| | | |
* | | | Update checker returns a boolean if callback was executed or not.José Valim2011-12-122-7/+9
|/ / /