José Valim
26e7400cc5
Fix diagnostics page for routing errors.
2011-12-15 19:43:49 +01:00
José Valim
283a087634
Clean up the cache before the request in case we are running in the reload_classes_only_on_change schema.
2011-12-15 18:48:10 +01:00
José Valim
de947c621d
There isn't a column_hash. It was being invoked by method missing.
2011-12-15 17:09:48 +01:00
Jon Leighton
8dba32f125
Fix #3987 .
2011-12-15 13:23:28 +00:00
José Valim
d7e714adac
Merge pull request #3994 from whilefalse/sass_cache_gitignore
...
Added .sass-cache/ directory to the genrated gitignore in engines.
2011-12-15 04:56:10 -08:00
Jon Leighton
0ddb9d6409
Merge pull request #3991 from akaspick/attrfix
...
Allow nested attributes in associations to update values in it's owner o...
2011-12-15 04:50:13 -08:00
Steven Anderson
54f60c1063
Added .sass-cache/ directory to the genrated gitignore in engines.
2011-12-15 12:38:52 +00:00
José Valim
ad87752ad6
Merge pull request #3990 from ugisozols/master
...
Remove autoload for non-existent file
2011-12-14 21:10:47 -08:00
Uģis Ozols
8d827325d0
Remove autoload for non-existent file.
2011-12-15 06:52:42 +02:00
Aaron Patterson
e9382474fd
seed file was already tested for existence. ಠ_ಠ
2011-12-14 19:09:31 -08:00
Andrew Kaspick
774ff18c09
Allow nested attributes in associations to update values in it's owner object. Fixes a regression from 3.0.x
2011-12-14 20:13:03 -06:00
Aaron Patterson
b6105b0b59
updating arel and journey dependencies
2011-12-14 13:26:49 -08:00
Xavier Noria
800252ca71
let sdoc say which version of rdoc we depend on
2011-12-14 22:23:17 +01:00
José Valim
2a10b914ad
Merge pull request #3988 from lest/fix-date-select
...
fix separator insertion in date_select helper
2011-12-14 12:37:22 -08:00
Sergey Nartimov
caa1c19787
fix separator insertion in date_select helper
2011-12-14 23:20:23 +03:00
Jon Leighton
889e8bee82
Fix #3672 again (dependent: delete_all perf)
2011-12-14 19:20:19 +00:00
Jon Leighton
8a37970312
Remove that there copy/pasted code 💣
2011-12-14 17:34:35 +00:00
Jon Leighton
909b337da8
Don't try to autosave nested assocs. Fixes #2961 .
2011-12-14 17:28:59 +00:00
Jon Leighton
18bf30982b
Cache column defaults on model. ~30% on Model.new due to avoiding repeatedly fetching connection.
2011-12-14 16:14:47 +00:00
Jon Leighton
7b0edbb9f2
Avoid super; speeds up Model.new by about 12%
2011-12-14 16:14:47 +00:00
José Valim
e3a4eb4b40
Close the response body on cascade pass, closes #3975 .
2011-12-14 17:03:35 +01:00
Jon Leighton
19bea9f1bd
Stop the build asploding on 1.8.7
2011-12-14 15:31:12 +00:00
Jeremy Kemper
384a60a16c
Merge pull request #3981 from choonkeat/master
...
Fix url_for options[:subdomain] to allow objects as values
2011-12-14 07:07:05 -08:00
Jon Leighton
bb44e5a80a
Use a separate module for 'external' attribute methods.
2011-12-14 14:51:57 +00:00
choonkeat
5f67cfeda1
Fix url_for options[:subdomain] to allow objects as values
...
* e.g. blog_url(subdomain: current_user) instead of blog_url(subdomain: current_user.to_param)
2011-12-14 22:43:42 +08:00
Piotr Sarnacki
a5589db063
Merge pull request #3979 from kommen/dbconsole_db_config
...
dbconsole: Use the app's database_configuration instead of duplicating loading code.
2011-12-14 05:48:04 -08:00
Dieter Komendera
6cbe2709d6
dbconsole: Use the app's database_configuration instead of duplicating code.
2011-12-14 14:08:41 +01:00
Jon Leighton
665ef116ac
Add return for 1.8.7
2011-12-14 11:11:12 +00:00
Jon Leighton
3ab49f87e4
Unfluff the CI.
...
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.
2011-12-14 11:05:00 +00:00
José Valim
f3531a8fc9
Clean up details keys before some tests to expire the cache.
2011-12-14 09:23:34 +01:00
Jon Leighton
38703ac897
Revert naive O(1) table_exists? implementation.
...
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.
2011-12-13 23:46:26 +00:00
Aaron Patterson
c7552d988e
dup the details hash if a key has already been set for this object
2011-12-13 15:26:29 -08:00
Vijay Dev
74e46e5156
Merge branch 'master' of github.com:lifo/docrails
2011-12-14 02:13:23 +05:30
Vijay Dev
23bd340a48
copy edits
2011-12-14 02:08:40 +05:30
José Valim
5dc4868962
Merge pull request #3970 from lest/backtrace-when-silenced
...
log exception backtrace when all backtrace lines silenced
2011-12-13 11:43:13 -08:00
Sergey Nartimov
081431fdf1
log exception backtrace when all backtrace lines silenced
2011-12-13 22:32:39 +03:00
Aaron Patterson
ab802e72dc
locale and default_locale may be the same, so uniq the array
2011-12-13 11:28:30 -08:00
Aaron Patterson
9d87a67590
stop freezing the details hash
2011-12-13 11:25:03 -08:00
Aaron Patterson
8b85e4a4a1
stop freezing hash value
2011-12-13 11:13:14 -08:00
Mikhail Dieterle
485e0249d2
typo in textile markup
2011-12-14 02:28:42 +08:00
José Valim
0f4da5b393
Fix failing AP tests.
2011-12-13 15:45:16 +01:00
José Valim
1668b900b5
Merge pull request #3963 from lest/logger-missing-require
...
missing require in buffered logger
2011-12-13 02:33:05 -08:00
José Valim
80256abb39
FileUpdateChecker should be able to handle deleted files.
2011-12-13 11:23:21 +01:00
lest
d060d6d131
missing require in buffered logger
2011-12-13 12:36:32 +03:00
José Valim
1f5b9bbdb3
Clean up FileUpdateChecker API.
2011-12-13 10:07:02 +01:00
José Valim
693d2be827
Move hooks back to initializers (we need an API that allows hooks to be replaced).
2011-12-13 09:29:18 +01:00
José Valim
cd3033eb62
Add config.file_watcher so developers can provide their own watchers (for instance, hooking on fsevents).
2011-12-13 09:29:18 +01:00
José Valim
148d15d824
Merge pull request #3958 from lest/comment-on-whitelist
...
commented whitelist mode enforcement for mass assignment
2011-12-12 23:57:02 -08:00
José Valim
f9df3ef845
Merge pull request #3960 from lest/activesupport-test-missing-require
...
missing require in activesupport test
2011-12-12 23:56:00 -08:00
José Valim
11aa167e23
Revert "Provide a unique point for running initializers."
...
This reverts commit c2e3ce8d1e1174e66536d59d8d97eb2cc8ce6f25.
Conflicts:
railties/lib/rails/application/configuration.rb
railties/lib/rails/application/finisher.rb
railties/lib/rails/engine.rb
2011-12-13 08:52:52 +01:00