Commit Graph

22376 Commits

Author SHA1 Message Date
Vijay Dev
8265c45db3 Replace LH with GitHub url for filing issues 2011-05-10 09:25:52 -07:00
David Heinemeier Hansson
4de977117f Update sprocket comments 2011-05-10 11:23:35 -05:00
Xavier Noria
8e55afb453 Merge pull request #487 from vijaydev/patch-3
s/javascript/JavaScript
2011-05-10 09:00:54 -07:00
Vijay Dev
c3c852c2d8 s/javascript/JavaScript 2011-05-10 08:51:50 -07:00
José Valim
3aa8f348ef Fix previous commit by allowing a proc to be given as response_body. This is deprecated and is going to be removed in future releases. 2011-05-10 16:53:57 +02:00
José Valim
4d5ce4738b Merge pull request #446 from danielstutzman/response_body_is_proc
New test: setting response_body to a Proc should be supported.
2011-05-10 07:38:43 -07:00
José Valim
fa8b0f44bd Merge pull request #484 from slainer68/master
Puts ActiveRecord::SessionStore attributes in white list, fixes #483
2011-05-10 07:23:26 -07:00
slainer68
95b4989559 Puts ActiveRecord::SessionStore attributes in white list, fixes #483 2011-05-10 16:11:28 +02:00
José Valim
8c05293b69 Merge pull request #482 from vijaydev/patch-2
Fix typos in IM documentation
2011-05-10 04:06:10 -07:00
Vijay Dev
a4765f74cd Fix typos in IM documentation 2011-05-10 03:44:57 -07:00
José Valim
302c912bf6 Document identity map inconsistency with associations, closes #474. 2011-05-10 11:33:39 +02:00
José Valim
5fc3564a50 Fix #480. Passing nil to create association works. 2011-05-10 11:18:16 +02:00
José Valim
0ceb21e335 Revert "b9ea751d0e56bd00d341766977a607ed3f7ddd0f".
Wrapping each Record.associations.build in a transaction is going to
make several unneeded queries. Reverting this commit also fixes #479.
2011-05-10 11:14:39 +02:00
José Valim
7c353d576a Add failing tests according to #479. 2011-05-10 11:11:30 +02:00
José Valim
b6a2113b8d Add failing tests, according to #480. 2011-05-10 11:02:34 +02:00
José Valim
9e4b715d79 Ensure assign_attributes and update_attributes do not fail on nil, closes #478. 2011-05-10 10:30:27 +02:00
José Valim
86a0f7f735 Add tests for content_for() for read, closes #475. 2011-05-10 10:22:09 +02:00
Vijay Dev
3f36441e90 Update copyright year in Active Resource and Active Support
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2011-05-09 20:17:23 -03:00
José Valim
0e1dcae185 Disable identity map by default. Detailed documentation will be pushed later. 2011-05-10 00:49:36 +02:00
Aaron Patterson
73ff6797ef use a null byte as a bind parameter substitute as it is not allowed in normal SQL. fixes #411, #417 2011-05-09 13:53:57 -07:00
José Valim
c56f4b272d Merge pull request #471 from joshk/remove_as_concern
Removed an unneed AS::Concern from AR::IdentityMap
2011-05-09 13:15:59 -07:00
Josh Kalderimis
d9f95c76a4 removed an unneed AS::Concern from AR::IdentityMap 2011-05-09 22:13:25 +02:00
José Valim
5b4849598a Merge pull request #461 from chrislwade/sorted-migrations
Sorted migrations
2011-05-09 09:54:04 -07:00
José Valim
59705deeaf Warn if we cannot verify CSRF token authenticity 2011-05-09 17:23:41 +02:00
José Valim
2750f2ee00 Fix failing test. 2011-05-09 17:08:59 +02:00
Mike Howard
372d72445b xml_mini.rb:_dasherize() replacement 20 to 25% faster
Signed-off-by: José Valim <jose.valim@gmail.com>
2011-05-09 17:06:56 +02:00
José Valim
851a4eab3c Oops, missing autoload, closes #466 2011-05-09 15:12:58 +02:00
José Valim
731923d79e Merge pull request #460 from guilleiguaran/patch-1
Just a minor fix in A.S CHANGELOG
2011-05-09 02:26:35 -07:00
José Valim
a9b72fbc9e Optimize the most common resolver case. 2011-05-09 11:17:24 +02:00
José Valim
4f03e404b2 No need for replace. 2011-05-09 10:42:54 +02:00
Christopher Wade
e585121539 Interleave db_list and file_list. 2011-05-09 01:46:35 -05:00
Christopher Wade
2952040f70 Sort migrations by the migration ID. 2011-05-09 01:45:45 -05:00
Guillermo Iguaran
1021b51b4f Just a minor fix in A.S CHANGELOG 2011-05-08 22:59:25 -07:00
Jon Leighton
72a4893452 Merge pull request #451 from baroquebobcat/fixing_last_for_issue_371 2011-05-08 23:43:34 +01:00
Nick Howard
92c10760d7 Fix for #371
if a query contains a limit or an offset, ActiveRecord::FinderMethods#find_last had inconsistent behavior.

If the records were loaded, it returned the last record in the cached list.
If they were not, it reversed the order of the query and changed the limit to one.
If the earlier limit was less than the total matching the query in the db,
it would return a different record than if the records had been cached.

This commit changes find_last so that it loads the records when getting the
last record on a query containing a limit or an offset, which makes the behavior consistent.
2011-05-08 23:42:53 +01:00
Jon Leighton
8f10ccd311 Ensure that ORDER BY clauses from default scopes are not included in calculation queries. Fixes #406. 2011-05-08 23:31:16 +01:00
José Valim
b3791da031 Merge pull request #457 from vijaydev/master
Adds examples in code for ordinalizing negative numbers
2011-05-08 11:21:47 -07:00
Vijay Dev
91c18554f6 adds code examples for negative ordinalize 2011-05-08 23:48:15 +05:30
Jon Leighton
a8daea4b85 Merge pull request #332 from cmeiklejohn/bug6230_optimistic_locking_double_quoted 2011-05-08 18:53:12 +01:00
Christopher Meiklejohn
4fbd8adf48 Don't quote ID's as Arel will quote them -- follow same conventions as the delete method. 2011-05-08 18:37:28 +01:00
Aaron Patterson
a45f300e5f Merge pull request #445 from prakashmurthy/lighthouse_6334
Fix for Lighthouse ticket # 6334 : to_xml should render valid xml or raise an error all the time
2011-05-08 10:13:39 -07:00
José Valim
f69be6ae8f Merge pull request #455 from joshk/mass_assignment_roles
Renamed mass-assignment scopes to roles
2011-05-08 08:19:38 -07:00
Josh Kalderimis
b2451f4a7f renamed mass-assignment scopes to roles, updated code, tests, docs and security guide 2011-05-08 16:43:29 +02:00
José Valim
9727dd1e38 Merge pull request #388 from smartinez87/remove_method
Better use #remove_possible_method here
2011-05-08 07:42:02 -07:00
Sebastian Martinez
b94d94a1ae Better use #remove_possible_method here 2011-05-08 11:31:56 -03:00
prakashmurthy
6b31fd8070 Lighthouse ticket # 6334; added tests to verify that spaces in key are dasherized. 2011-05-08 06:13:18 -06:00
José Valim
80bf68aa1b prepend the assets route instead of appending, closes #436 2011-05-08 12:59:04 +02:00
José Valim
c2b55c4fbf Merge pull request #454 from dlee/nested_indifferent_access
indifferent access should recurse Hash subclasses
2011-05-08 03:44:27 -07:00
David Lee
099eb2b3fd indifferent access should recurse Hash subclasses
This commit makes Hash subclasses convert to HWIA by default for nested
objects of subclasses of Hash, but allows certain subclasses to prevent nested
conversion by introducing Hash#nested_under_indifferent_access that subclasses
can overwrite.

ActiveSupport::OrderedHash is one such subclass that overwrites
+nested_under_indifferent_access+, since implicitly converting it to HWIA would
remove the ordering of keys and values in Ruby 1.8.

This change is necessary because commit ce9456e broke nested indifferent access
conversion for all subclasses of Hash.
2011-05-08 03:40:51 -07:00
José Valim
e5a0122419 Revert to use === only here because of perf. :( 2011-05-08 12:40:15 +02:00