Commit Graph

25700 Commits

Author SHA1 Message Date
Xavier Noria
17bf04ff0d registers PR #2419 in the CHANGELOG 2011-10-24 14:43:46 +02:00
Xavier Noria
b064614ffb Merge pull request #2419 from dmitriy-kiriyenko/drop_test_database_in_development_when_running_rake_db_drop
When running "rake db:drop" also drop test database in development environment
2011-10-24 05:35:06 -07:00
José Valim
0e8a4b3e57 Merge pull request #3416 from arunagw/rbx_test_fixes
ActionPack test fix for RBX
2011-10-24 01:48:32 -07:00
Arun Agrawal
244dcfea47 ActionPack test fix for RBX 2011-10-24 14:11:20 +05:30
Jon Leighton
e75c18bff8 Ignore .rbx directories (rbx compiled bytecode files) 2011-10-23 18:07:17 +03:00
Vijay Dev
8698debcc2 Merge branch 'master' of github.com:lifo/docrails 2011-10-23 01:38:37 +05:30
Vijay Dev
227c31f7b6 edge doesnt provide turn gem in the gemfile anymore 2011-10-23 01:34:02 +05:30
Vijay Dev
337ff13be9 Merge pull request #3352 from arunagw/bump_sprockets
Bump sprockets
2011-10-22 13:01:24 -07:00
José Valim
dabf6cf1be Merge pull request #3408 from guilleiguaran/remove-turn
Remove Turn from default Gemfile.
2011-10-22 12:56:21 -07:00
Guillermo Iguaran
a458833705 Remove Turn from default Gemfile.
We still looking for a best presentation for tests output.
2011-10-22 14:34:05 -05:00
Aaron Patterson
259741ae73 Revert "Merge pull request #3405 from arunagw/middleware_name"
This reverts commit c33090523c, reversing
changes made to 1c1c3fc2c0.
2011-10-22 12:28:06 -07:00
Aaron Patterson
c33090523c Merge pull request #3405 from arunagw/middleware_name
Using middleware name to show proper name in the info
2011-10-22 11:45:38 -07:00
Vijay Dev
1c1c3fc2c0 minor fixes in the composed_of doc 2011-10-22 23:53:52 +05:30
Xavier Noria
f0a9411ede Merge pull request #3407 from arunagw/rake_upgrade
No need to check ruby version here as rake 9.2.2 is out with the same fix
2011-10-22 11:04:40 -07:00
Arun Agrawal
c930170581 No need to check ruby version here
As rake 0.9.2.2 is out with the same 
fix as 0.9.3.beta having
2011-10-22 22:29:38 +05:30
Arun Agrawal
bc5d334c7a Using middleware name to show proper name in the info 2011-10-22 19:16:43 +05:30
José Valim
de17426980 Merge pull request #3404 from arunagw/warning_removed_request_id
Warnings removed from RequestIdTest
2011-10-22 04:06:52 -07:00
Arun Agrawal
50dfd58fdb Warnings removed from RequestIdTest 2011-10-22 16:30:48 +05:30
Arun Agrawal
4ea21b6de2 Updated rack version in docs for 3.2 2011-10-22 15:54:55 +05:30
Arun Agrawal
6d5b92c735 Rails version to 3.2.0.beta in docs 2011-10-22 15:53:11 +05:30
Arun Agrawal
50be4231e9 Middleware details updated for 3.2 2011-10-22 15:51:55 +05:30
José Valim
3c3129993a Merge pull request #3396 from bdurand/session_cache_store
Add ActionDispatch::Session::CacheStore as a generic way of storing sessions in a cache
2011-10-21 23:41:15 -07:00
Aaron Patterson
d8b09f3866 Merge pull request #3400 from greinacker/sqlite-decimal
sqlite3 adapter drops :decimal columns precision & scale when migration tries to alter them
2011-10-21 16:49:21 -07:00
Greg Reinacker
f092be821d preserve decimal column attributes after migration 2011-10-21 17:30:39 -06:00
José Valim
79d01a8f16 Merge pull request #3395 from bdurand/fix_file_store_cleanup
Fix ActiveSupport::Cache::FileStore.cleanup to actually work.
2011-10-21 12:42:06 -07:00
José Valim
b838570bd6 Merge pull request #3394 from bdurand/buffered_logger_threads
Fix threading issues with BufferedLogger.
2011-10-21 12:29:14 -07:00
Brian Durand
ec93f363ca Fix ActiveSupport::Cache::FileStore.cleanup to actually work. 2011-10-21 13:28:24 -05:00
Brian Durand
2b04c2f66e Add ActionDispatch::Session::CacheStore as a generic way of storing sessions in a cache. 2011-10-21 13:13:29 -05:00
Brian Durand
d565fda5f2 Fix threading issues with BufferedLogger. 2011-10-21 12:43:52 -05:00
José Valim
e2aaae1629 Merge pull request #3387 from arunagw/tagged_log_nil
Checking blank if tag might coming nil or blank
2011-10-21 03:46:13 -07:00
Arun Agrawal
c495cbcda9 Checking blank if tag might coming nil or blank
In log it should not show the empty array.
2011-10-21 16:11:09 +05:30
Prem Sichanugrist
f0be2cb192 Add some note on adding index to HABTM table 2011-10-20 17:15:28 -04:00
Prem Sichanugrist
d64e0955d0 Use new migration style in HABTM join table
Yes, we're on Rails 3.1 now.
2011-10-20 17:13:01 -04:00
Pepe Hipolito
0cd93a6e2b Fixed typo.
Ruby will know to look for this file at => Ruby will know how to look for this file at
2011-10-20 15:58:51 -04:00
Pepe Hipolito
48e1f8ba4c Fixed typo.
a long the way => along the way
2011-10-20 15:37:35 -04:00
Vijay Dev
af1b5c54cf Merge branch 'master' of github.com:lifo/docrails 2011-10-20 23:20:44 +05:30
Aaron Patterson
ee9d9fb5fa Merge pull request #3258 from ileitch/3-1-stable
Postgres: Do not attempt to deallocate a statement if the connection is no longer active.
2011-10-20 08:45:22 -07:00
Martin Svalin
274c3fad50 Fixed misleading docs for String#to_formatted_s(:db) 2011-10-20 16:31:23 +02:00
Andrew France
66880cfe41 Correct ActionMailer subject i18n lookup scope.
The :actionmailer i18n scope part is not used and according to https://github.com/rails/rails/pull/2542 the implementation is correct.
2011-10-20 12:32:11 +02:00
José Valim
ef3e149db3 Merge pull request #3375 from arunagw/middleware_test_fix
Adding ActionDispatch::RequestId in middleware test
2011-10-20 00:35:07 -07:00
Ryan Bigg
ee1223c1ee [engines guide] explanation of overriding views + referencing routes from an engine within an application 2011-10-20 18:30:50 +11:00
Arun Agrawal
5c5d5b3d25 Adding ActionDispatch::RequestId in middleware test 2011-10-20 12:59:27 +05:30
José Valim
00eb67e01f Merge pull request #3374 from marcbowes/master
Regexp fixup
2011-10-20 00:11:06 -07:00
Marc Bowes
951a325c99 Remove the unneeded \d when sanitizing X-Request-Id. 2011-10-20 10:00:42 +03:00
Ryan Bigg
13e6f0cea8 [engines guide] some fixes for the author id migration including proof of not copying over other migrations again 2011-10-20 17:32:48 +11:00
Ryan Bigg
3e2d35b050 [engines guide] add missing end for to_s method 2011-10-20 17:10:46 +11:00
José Valim
4e9729df3f Don't use :path in Gemfile for --dev except for Rails. 2011-10-20 00:38:58 +02:00
Ryan Bigg
1cc6105d4d [engines guide] wrap up 'Configuring an Engine' section 2011-10-20 08:48:06 +11:00
Ryan Bigg
8ede74e73a [engines guide] Rather than calling name, require a to_s method to be defined on the 'User' class 2011-10-20 08:48:06 +11:00
Ryan Bigg
9694ca1a3b [engines guide] mention that we cover similar ground to the Getting Started Guide 2011-10-20 08:48:05 +11:00