aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ensure that ORDER BY clauses from default scopes are not included in ↵Jon Leighton2011-05-082-1/+5
| | | | calculation queries. Fixes #406.
* Merge pull request #457 from vijaydev/masterJosé Valim2011-05-081-1/+3
|\ | | | | Adds examples in code for ordinalizing negative numbers
| * adds code examples for negative ordinalizeVijay Dev2011-05-081-1/+3
|/
* Merge pull request #332 from ↵Jon Leighton2011-05-085-2/+52
|\ | | | | | | cmeiklejohn/bug6230_optimistic_locking_double_quoted
| * Don't quote ID's as Arel will quote them -- follow same conventions as the ↵Christopher Meiklejohn2011-05-085-2/+52
|/ | | | delete method.
* Merge pull request #445 from prakashmurthy/lighthouse_6334Aaron Patterson2011-05-081-0/+10
|\ | | | | Fix for Lighthouse ticket # 6334 : to_xml should render valid xml or raise an error all the time
| * Lighthouse ticket # 6334; added tests to verify that spaces in key are ↵prakashmurthy2011-05-081-0/+10
| | | | | | | | dasherized.
* | Merge pull request #455 from joshk/mass_assignment_rolesJosé Valim2011-05-086-64/+64
|\ \ | | | | | | Renamed mass-assignment scopes to roles
| * | renamed mass-assignment scopes to roles, updated code, tests, docs and ↵Josh Kalderimis2011-05-086-64/+64
|/ / | | | | | | security guide
* | Merge pull request #388 from smartinez87/remove_methodJosé Valim2011-05-081-2/+3
|\ \ | |/ |/| Better use #remove_possible_method here
| * Better use #remove_possible_method hereSebastian Martinez2011-05-081-2/+3
| |
* | prepend the assets route instead of appending, closes #436José Valim2011-05-085-8/+37
| |
* | Merge pull request #454 from dlee/nested_indifferent_accessJosé Valim2011-05-085-5/+35
|\ \ | | | | | | indifferent access should recurse Hash subclasses
| * | indifferent access should recurse Hash subclassesDavid Lee2011-05-085-5/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Revert to use === only here because of perf. :(José Valim2011-05-081-3/+1
| | |
* | | Merge pull request #420 from burke/masterJosé Valim2011-05-083-1/+14
|\ \ \ | |/ / |/| | Accept single prefix in ActionView::MissingTemplate#initialize
| * | Added activesupport requires for Array.wrap in previously modified filesBurke Libbey2011-05-072-0/+3
| | |
| * | Remove redundant check for is_a?(String)Burke Libbey2011-05-062-2/+2
| | |
| * | Added a test for MissingTemplate change, and changed to use Array.wrap() asBurke Libbey2011-05-063-2/+11
| | | | | | | | | | | | requested by josevalim.
| * | Made ActionView::MissingTemplate#initialize optionally accept a single stringBurke Libbey2011-05-061-0/+1
| | | | | | | | | | | | prefix to be converted to an array as in ActionView::PathSet#find_all.
* | | Merge pull request #430 from dlee/methodoverrideJosé Valim2011-05-085-5/+53
|\ \ \ | | | | | | | | Logs should show overridden method; Issue 426
| * | | Logs should show overridden method; Issue 426David Lee2011-05-075-5/+53
| | | |
* | | | Fix failing xml mini test.José Valim2011-05-081-1/+4
| | | |
* | | | Merge pull request #452 from jrom/runner-r-aliasJosé Valim2011-05-081-1/+2
|\ \ \ \ | | | | | | | | | | Add alias `r` for rails runner
| * | | | Add alias `r` for rails runnerJordi Romero2011-05-071-1/+2
|/ / / /
* | | | Merge pull request #449 from msgehard/rename_duplicate_test_methodsSantiago Pastorino2011-05-072-2/+2
|\ \ \ \ | | | | | | | | | | Rename duplicate tests
| * | | | Rename duplicate tests. There is now one failing test that was failing ↵Mike Gehard2011-05-072-2/+2
|/ / / / | | | | | | | | | | | | before the rename but was never getting run.
* | | | Merge pull request #442 from jasonnoble/namespace_fixturesAaron Patterson2011-05-078-318/+323
|\ \ \ \ | | | | | | | | | | Namespace Fixtures in ActiveRecord
| * | | | Added deprecation warning for Fixture(s) (Use ActiveRecord::Fixture(s))Jason Noble2011-05-071-0/+3
| | | | |
| * | | | Namespace Fixtures in ActiveRecordJason Noble2011-05-078-318/+320
| | | | | | | | | | | | | | | [Fixes #439]
* | | | | Revert "Merge pull request #275 from pk-amooma/master"José Valim2011-05-072-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several AP tests fail after this change. This reverts commit aaf01cd53718c8aa5b69ac056b997e6dd9893777, reversing changes made to 9cc18c52faeebaad6a76bd62cdca1c6b9f96afed.
* | | | | Always expand */*José Valim2011-05-072-8/+5
| | | | |
* | | | | Fixes ticket #6379. Improved the handling of Accept headers containing */*.mathieuravaux2011-05-072-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `lookup_context#formats=` being too restrictive, "Accept: text/javascript, */*" resulted in [:js, "*/*"] formats instead of [:js, :html]. Signed-off-by: José Valim <jose.valim@gmail.com>
* | | | | xml_mini_test.rb now runs.José Valim2011-05-072-8/+1
| | | | |
* | | | | Merge pull request #438 from jasonmichaelroth/ordinalize_negative_numbersAaron Patterson2011-05-072-2/+32
|\| | | | | | | | | | | | | | ordinalize negative numbers patch
| * | | | ordinalize negative numbers patchJason2011-05-072-2/+32
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Applied patch by Amir Manji https://github.com/rails/rails/issues/437#issuecomment-1116045 Signed-off-by: Jason <jasonmichaelroth@gmail.com>
* | | | Merge pull request #435 from vijaydev/masterXavier Noria2011-05-071-5/+10
|\ \ \ \ | | | | | | | | | | Update README template to include info about app/assets
| * | | | update readme to reflect app/assetsVijay Dev2011-05-071-5/+10
|/ / / /
* | | | Merge pull request #434 from arunagw/changelog_docJosé Valim2011-05-071-0/+12
|\ \ \ \ | | | | | | | | | | Updated changelog for jdbc* adapters template.
| * | | | Updated change log for jdbc* adapters template.Arun Agrawal2011-05-071-0/+12
| | | | |
* | | | | Class.new.name returns an empty string on 1.8José Valim2011-05-071-1/+1
| | | | |
* | | | | Revert "Revert the merge because tests did not pass."José Valim2011-05-073-5/+44
|/ / / / | | | | | | | | | | | | This reverts commit 886818d2bab40585c0cea763002ffc16917dd0b3.
* | | | Update CHANGELOG.José Valim2011-05-071-0/+2
| | | |
* | | | Merge pull request #343 from asanghi/ampmJosé Valim2011-05-072-4/+85
|\ \ \ \ | | | | | | | | | | Allow AM/PM format in datetime selectors
| * | | | DRY this baby upAditya Sanghi2011-04-291-23/+4
| | | | |
| * | | | add more documentation; remove unused assignmentAditya Sanghi2011-04-291-4/+14
| | | | |
| * | | | Allow AM/PM in datetime selectorsAditya Sanghi2011-04-292-0/+90
| | | | |
* | | | | Merge pull request #286 from jasoncodes/marshal_subsecJosé Valim2011-05-072-0/+8
|\ \ \ \ \ | | | | | | | | | | | | Fix marshal round-tripping of fractional seconds (Time#subsec).
| * | | | | Fix marshal round-tripping of fractional seconds (Time#subsec).Jason Weathered2011-04-172-0/+8
| | | | | |
* | | | | | ADdd missing requires (thanks to @arunagw)José Valim2011-05-072-1/+2
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 23:52:24 +0000