Commit Graph

32953 Commits

Author SHA1 Message Date
Xavier Noria
133d42bc0f fixes the suite for uploaded files 2012-09-23 00:50:30 +02:00
Xavier Noria
3b0da715c5 documents ActionDispatch::Http::UploadedFile 2012-09-22 23:56:39 +02:00
Rafael Mendonça França
512eb971e4 Put the new CHANGELOG entries always in the top [ci skip] 2012-09-22 18:22:30 -03:00
Xavier Noria
40b5711697 Merge pull request #7713 from porras/action-dispatch-upload-delegates-close-to-tempfile
Delegate ActionDispatch::Http::UploadedFile#close to tempfile
2012-09-22 13:52:19 -07:00
Sergio Gil Pérez de la Manga
e9ba548baf Accept parameters in methods delegated to tempfile 2012-09-22 22:37:00 +02:00
Santiago Pastorino
19fa8fa3c4 Fix test_find_in_batches_should_use_any_column_as_primary_key 2012-09-22 10:57:54 -03:00
Santiago Pastorino
7be880980d Merge pull request #7728 from guilleiguaran/fix-asset-test
Update asset test to match one in sprockets-rails
2012-09-21 19:51:08 -07:00
Guillermo Iguaran
fd8b9bee47 Update asset test to match one in sprockets-rails 2012-09-21 21:49:28 -05:00
Santiago Pastorino
ec28c059b7 Merge pull request #7726 from jcorcuera/master
Remove '.rb' from require sentences
2012-09-21 16:10:23 -07:00
Santiago Pastorino
b7918cce04 Use debugger gem if we are not Travis and Ruby < 2.0 2012-09-21 19:59:13 -03:00
Santiago Pastorino
44fa92129f Add debugger to mri:test section of the Gemfile 2012-09-21 19:45:55 -03:00
Santiago Pastorino
5b99cf088c start could be a string
Related to 761bc751d31c22e2c2fdae2b4cdd435b68b6d783 and
eb876c4d07130f15be2cac7be968cc393f959c62
2012-09-21 19:42:16 -03:00
Santiago Pastorino
eb876c4d07 Revert "Fix find_in_batches with customized primary_key"
This reverts commit 761bc751d31c22e2c2fdae2b4cdd435b68b6d783.

This commit wasn't fixing any issue just using the same table for
different models with different primary keys.
2012-09-21 19:14:17 -03:00
Santiago Pastorino
008eaebb56 Raise the same exception the code is handling 2012-09-21 19:05:12 -03:00
José Corcuera Z
c60e19bc6d Remove .rb from require sentences 2012-09-21 16:57:15 -05:00
Rafael Mendonça França
0e288ec98c Revert "update ActionMailer::Base documentation [ci skip]"
This reverts commit f5654e78b248ecc90e8556366c927e1176c2428f.

Conflicts:
	actionmailer/lib/action_mailer/base.rb

Reason: @frodsan asked me to revert since this change is breaking the
documentation in the edge API site
2012-09-21 16:22:46 -03:00
Jeremy Kemper
7174307bd8 Style: remove hash noise 2012-09-21 12:08:02 -07:00
Jeremy Kemper
78b30fed93 Correct default charset/collation for mysql dbs 2012-09-21 12:03:16 -07:00
Vijay Dev
68bd4db190 Merge branch 'master' of github.com:lifo/docrails 2012-09-22 00:27:01 +05:30
José Corcuera
89a011ab8c Update action_mailer_basics.md to ruby 1.9 syntax. [ci skip] 2012-09-21 13:55:42 -05:00
Jeremy Kemper
57bdafb932 Use default charset/collation only if *neither* is specified. Otherwise we set utf8_unicode_ci collation on latin1 table. 2012-09-21 11:37:49 -07:00
Vijay Dev
96ded2efb7 some edits in 4.0 release notes [ci skip] 2012-09-22 00:06:07 +05:30
Vijay Dev
271d1e7d8c Fix typos and links in engines guide [ci skip] 2012-09-21 23:54:17 +05:30
José Corcuera
4a04833c1b Update examples in action_controller_overview.md to ruby 1.9 syntax. [ci skip] 2012-09-21 13:11:34 -05:00
Vijay Dev
25c3c89e97 fix some md syntax errors and general revisions [ci skip] 2012-09-21 23:34:36 +05:30
José Corcuera
66bc017849 Update examples in AS::Concern to use correct scope syntax. [ci skip] 2012-09-21 12:29:44 -05:00
Vijay Dev
3b7947ea31 Merge branch 'master' of github.com:lifo/docrails
Conflicts:
	actionmailer/lib/action_mailer/base.rb
	activesupport/lib/active_support/configurable.rb
	activesupport/lib/active_support/core_ext/module/deprecation.rb
	guides/source/action_controller_overview.md
	guides/source/active_support_core_extensions.md
	guides/source/ajax_on_rails.textile
	guides/source/association_basics.textile
	guides/source/upgrading_ruby_on_rails.md

While resolving conflicts, I have chosen to ignore changes done in
docrails at some places - these will be most likely 1.9 hash syntax
changes.
2012-09-21 22:49:20 +05:30
Vijay Dev
7c0e3b87ef remove nodoc [ci skip] 2012-09-21 22:36:13 +05:30
Stephan Hagemann
c15e4235f0 Updated description of what engines are used for 2012-09-21 10:57:15 -06:00
Jon Leighton
f74ddc8a4c Make the serializable test much looser
It's too hard to test this properly, so let's just check that there are
no errors.
2012-09-21 17:56:04 +01:00
Rafael Mendonça França
de9d1c6366 Merge pull request #7724 from joliss/changelog
Fix MIME type in CHANGELOG [ci skip]
2012-09-21 09:21:03 -07:00
Jo Liss
cf1f670846 Fix MIME type in CHANGELOG 2012-09-21 18:19:18 +02:00
Jon Leighton
392eeecc11 Support for specifying transaction isolation level
If your database supports setting the isolation level for a transaction,
you can set it like so:

  Post.transaction(isolation: :serializable) do
    # ...
  end

Valid isolation levels are:

* `:read_uncommitted`
* `:read_committed`
* `:repeatable_read`
* `:serializable`

You should consult the documentation for your database to understand the
semantics of these different levels:

* http://www.postgresql.org/docs/9.1/static/transaction-iso.html
* https://dev.mysql.com/doc/refman/5.0/en/set-transaction.html

An `ActiveRecord::TransactionIsolationError` will be raised if:

* The adapter does not support setting the isolation level
* You are joining an existing open transaction
* You are creating a nested (savepoint) transaction

The mysql, mysql2 and postgresql adapters support setting the
transaction isolation level. However, support is disabled for mysql
versions below 5, because they are affected by a bug
(http://bugs.mysql.com/bug.php?id=39170) which means the isolation level
gets persisted outside the transaction.
2012-09-21 16:32:27 +01:00
Jo Liss
3f9c1a1105 Revert "Fix MIME type in CHANGELOG"
CHANGELOG edits do not belongs on docrails, so I'll send a pull request
instead. Thanks @rafaelfranca for catching this.

This reverts commit 84c9491eab5b9f7c4250ca4c2ca5d763e8c4ff4d.
2012-09-21 17:08:00 +02:00
Jo Liss
84c9491eab Fix MIME type in CHANGELOG 2012-09-21 16:37:46 +02:00
Steve Klabnik
79cbfc8290 Add extra note about :dependent => :destroy.
Callbacks may interfere with each other.
2012-09-21 12:58:14 +03:00
Jon Leighton
834d6da54e Merge pull request #5248 from jcoleman/should-unset-association-when-an-existing-record-is-destroyed
Unset association when existing record is destroyed.
2012-09-21 02:40:26 -07:00
Sergio Gil Pérez de la Manga
f3afaa64cf Update CHANGELOG.md 2012-09-21 08:34:05 +02:00
Carlos Antonio da Silva
a507c641ec Get rid of global variable in AR transactions test 2012-09-20 23:14:35 -03:00
Przemek Hocke
79942d426d correct a typo 2012-09-21 03:49:26 +02:00
Przemek Hocke
fca6c0f03c Add missing "m" char 2012-09-21 03:48:17 +02:00
Przemek Hocke
649a95b8af fix two typos in the associations guide 2012-09-21 03:46:14 +02:00
Przemek Hocke
deed3f9975 fix a small typo 2012-09-21 03:40:49 +02:00
Carlos Antonio da Silva
ed05e92239 Update delegate docs with new hash syntax [ci skip] 2012-09-20 18:51:14 -03:00
Carlos Antonio da Silva
1eef814e7a Add changelog entry and docs about class delegation using the symbol :class
See #7613. [ci skip]
2012-09-20 18:50:53 -03:00
Santiago Pastorino
2ecfed2f5a Merge pull request #7721 from frodsan/ar_changelog_improvement
remove unnecessary entry and make minor edits to AR/CHANGELOG [ci skip]
2012-09-20 12:03:00 -07:00
Francesco Rodriguez
f4a9d7db1c remove unnecessary entry and make minor edits to AR/CHANGELOG [ci skip] 2012-09-20 13:48:32 -05:00
Jeremy Kemper
0a7b1319d3 Merge pull request #7613 from marcandre/delegate_to_class
Nice and easy delegation to the class
2012-09-20 11:19:47 -07:00
Jon Leighton
81084bda1d Merge pull request #7720 from frodsan/rename_ar_tag
rename AR::Model::Tag to AR::Tag
2012-09-20 11:00:17 -07:00
Rafael Mendonça França
6e3532d5e4 Merge pull request #7719 from frodsan/strong_params_docs_part_two
Strong Parameters documentation
2012-09-20 10:47:30 -07:00