Aaron Patterson
1b075220ef
Merge pull request #5810 from kennyj/fix_5797
...
Fix #5797 . Error calling dup method on AR model with serialized field
2012-05-30 11:26:59 -07:00
Aaron Patterson
7c1b61e50e
Merge pull request #6386 from kennyj/fix_logs_name_consistency
...
Fix logs name consistency.
2012-05-30 11:06:49 -07:00
Vijay Dev
9ed62ade5f
cut down spaces [ci skip]
2012-05-30 23:11:09 +05:30
Vijay Dev
3b6d66a0c8
Revert "Revert "[AR querying guide] Add examples for take(limit), first(limit) and last(limit)""
...
This reverts commit 5559a2ae98dcda6854f38890025b52edfb2836f5.
Reason: These are for selecting multiple objects and there isn't a need
to club them with the selecting single objects section, as discussed
with the author.
2012-05-30 23:08:35 +05:30
Vijay Dev
ec74763c39
Merge branch 'master' of github.com:lifo/docrails
2012-05-30 22:53:52 +05:30
Vijay Dev
032f502f12
copy edit the batches docs [ci skip]
2012-05-30 22:40:51 +05:30
Vijay Dev
2adba2e285
let's not add too much details upfront in the introduction [ci skip]
2012-05-30 22:40:31 +05:30
Vijay Dev
5559a2ae98
Revert "[AR querying guide] Add examples for take(limit), first(limit) and last(limit)"
...
This reverts commit 724d6fa6bb48b61798c223b47dd27155839c40d5.
Reason: This is already documented in another section, albeit without
the arguments examples. Let's add them in another commit in the
appropriate sections
[ci skip]
2012-05-30 22:29:02 +05:30
Vijay Dev
e591b7b4e1
some copy edits [ci skip]
2012-05-30 22:28:58 +05:30
José Valim
0406a13fac
Merge pull request #6551 from kennyj/add_entry_20120531
...
Add a railtie's changelog entry about runner hook.
2012-05-30 08:19:05 -07:00
kennyj
f7ed0af6c1
Add a changelog entry about runner hook.
2012-05-31 00:16:13 +09:00
kennyj
d09b2fd09d
Fix #5797 . Error calling dup method on AR model with serialized field
2012-05-30 23:24:23 +09:00
José Valim
0cc4e37178
Merge pull request #6550 from arunagw/warning_removed_assert_match
...
Some of the warnings removed from "railties"
2012-05-30 02:34:09 -07:00
Arun Agrawal
397e47d807
Unused variable warning removed.
2012-05-30 14:46:17 +05:30
Arun Agrawal
05f88024de
More assert_match warnings fixed.
2012-05-30 14:46:08 +05:30
Arun Agrawal
4646b2ecac
Warnings removed for "assert_match /".
2012-05-30 14:35:55 +05:30
José Valim
555d8152c7
Merge pull request #5843 from kuroda/translation_of_deeply_nested_model_attributes
...
Fix human attribute_name to handle deeply nested attributes
2012-05-29 23:26:26 -07:00
Jeremy Kemper
70bc0d7a4f
Merge pull request #6546 from erichmenge/patch-as-json
...
True, False, and Nil should be represented in as_json as themselves.
2012-05-29 21:22:55 -07:00
Erich Menge
1e335ad138
True, False, and Nil should be represented in as_json as themselves.
2012-05-29 21:13:03 -05:00
Brent Vatne
6ae626b810
fix typo in render_template [ci skip]
2012-05-29 16:35:57 -07:00
Saulius Grigaliunas
a546f7fb26
Revert my own commit, didnt notice that this was intentional. [ci skip]
2012-05-29 23:44:30 +01:00
Saulius Grigaliunas
87ba0b48cd
Routing guide: route constraints are anchored by default, remove ^ character. [ci skip]
2012-05-29 22:46:58 +01:00
Xavier Noria
669694fe88
Merge pull request #6502 from rafmagana/guides_refactor_rakefile
...
[Guides] refactor rakefile to have a :guides namespace and a task that shows help
2012-05-29 14:09:08 -07:00
Rafael Magana
97fb1b6e65
fix typo on ActiveSupport instrumentation guide [ci skip]
2012-05-29 15:08:53 -05:00
Xavier Noria
70ad12a72f
copy edits the upgrading guide
2012-05-29 21:26:04 +02:00
José Valim
9fa3926e4f
Merge pull request #6518 from kennyj/fix_5847-4
...
(Try again) Fix #5847 and #4045 .
2012-05-29 08:48:00 -07:00
kennyj
c0ba0f01d0
Fix #5847 and #4045 on master.
2012-05-30 00:27:43 +09:00
kennyj
cc7dd66c68
Use runner hook to load ActiveRecord::Base.
2012-05-30 00:27:38 +09:00
kennyj
f8e7904dc0
Add support runner hook.
2012-05-29 23:46:08 +09:00
kennyj
5cc9c7e369
SchemaMigration should be loaded lazily.
2012-05-29 22:32:15 +09:00
kennyj
8d01c61129
Add a testcase for #5847 .
2012-05-29 22:32:14 +09:00
Carlos Antonio da Silva
d46a36805b
Merge pull request #6535 from arunagw/jruby_module_test
...
JRuby return different Array for module contents.
2012-05-29 05:05:14 -07:00
Arun Agrawal
3335cb7f12
JRuby return different Array for module contents.
...
Test was failing against JRuby.
It loads like [Constant3 Constant1]
2012-05-29 17:30:12 +05:30
José Valim
6ba93ac6f6
Merge pull request #6525 from freerange/minitest-passthrough-exceptions
...
Exceptions like Interrupt & NoMemoryError should not be rescued in tests.
2012-05-29 01:35:40 -07:00
James Mead
7d8e5fac75
Avoid dependency on MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS.
2012-05-29 09:28:22 +01:00
José Valim
2d898cd8b7
Merge pull request #6528 from frodsan/update_hash_syntax_gemfile_template
...
update Gemfile template to 1.9 hash syntax
2012-05-29 01:01:38 -07:00
Francesco Rodriguez
5db367a7fe
update Gemfile template to 1.9 hash syntax
2012-05-29 00:20:05 -05:00
Francesco Rodriguez
5487daba97
fix example format and add markup in Module#mattr_accessor documentation [ci skip]
2012-05-29 00:00:32 -05:00
Carlos Antonio da Silva
d4a7deee8e
Merge pull request #6526 from appfolio/decoupling_activesupport_from_actionivew
...
Decoupling ActiveSupport from ActionView
2012-05-28 21:54:36 -07:00
Francesco Rodriguez
34f82abf01
fix typos on migrations guide [ci skip]
2012-05-28 23:41:49 -05:00
Andrew Mutz
598f8bdda1
decoupling activesupport performance testing from actionview and adding tests
2012-05-28 21:09:20 -07:00
Carlos Antonio da Silva
3d4ede2959
Merge pull request #6527 from frodsan/add_test_to_delete_by_fixnum_or_string
...
Add tests to delete by fixnum or string id with has many through associations
2012-05-28 21:04:40 -07:00
Francesco Rodriguez
b89553cf41
Add tests to delete by fixnum or string id with has many through associations
2012-05-28 22:31:41 -05:00
Carlos Antonio da Silva
8795ac5297
Add note about CollectionAssociation#delete change to upgrading guide [ci skip]
2012-05-29 00:19:39 -03:00
Carlos Antonio da Silva
18af5dab07
Fix failing build related to change in CollectionAssociation#delete
...
Merge commit 6f1d9d00ffd9d411b2bd488da4eb92b7e2fd972e
2012-05-29 00:18:43 -03:00
Carlos Antonio da Silva
400c5fefcf
Review requires from number helper
...
Some of these requires are now only necessary in
ActiveSupport::NumberHelper. Add hash/keys require due to symbolize_keys
usage in number helpers. Also remove some whitespaces.
Closes #6414
2012-05-28 23:55:20 -03:00
Rafael Magana
2c4da97b19
[contributing guide] add instructions to update fork [ci skip]
2012-05-28 21:46:52 -05:00
Carlos Antonio da Silva
f9cb645dfc
Yield only one argument instead of splatting.
...
Add Changelog entry. Closes #4003
2012-05-28 23:16:34 -03:00
chrisfinne
9cc2bf69ce
Allow blocks for count with ActiveRecord::Relation. Document and test that sum allows blocks
2012-05-28 23:16:07 -03:00
Carlos Antonio da Silva
6f1d9d00ff
Merge pull request #6511 from frodsan/add_fixnum_string_support_for_delete
...
Add support for CollectionAssociation#delete by Fixnum or String
2012-05-28 19:15:21 -07:00