aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* adds code examples for negative ordinalizeVijay Dev2011-05-081-1/+3
* Merge pull request #332 from cmeiklejohn/bug6230_optimistic_locking_double_qu...Jon Leighton2011-05-085-2/+52
|\
| * Don't quote ID's as Arel will quote them -- follow same conventions as the de...Christopher Meiklejohn2011-05-085-2/+52
|/
* Merge pull request #445 from prakashmurthy/lighthouse_6334Aaron Patterson2011-05-081-0/+10
|\
| * Lighthouse ticket # 6334; added tests to verify that spaces in key are dasher...prakashmurthy2011-05-081-0/+10
* | Merge pull request #455 from joshk/mass_assignment_rolesJosé Valim2011-05-086-64/+64
|\ \
| * | renamed mass-assignment scopes to roles, updated code, tests, docs and securi...Josh Kalderimis2011-05-086-64/+64
|/ /
* | Merge pull request #388 from smartinez87/remove_methodJosé Valim2011-05-081-2/+3
|\ \ | |/ |/|
| * 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 subclassesDavid Lee2011-05-085-5/+35
* | | 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
|\ \ \ | |/ / |/| |
| * | 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
| * | Made ActionView::MissingTemplate#initialize optionally accept a single stringBurke Libbey2011-05-061-0/+1
* | | Merge pull request #430 from dlee/methodoverrideJosé Valim2011-05-085-5/+53
|\ \ \
| * | | 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 runnerJordi Romero2011-05-071-1/+2
|/ / / /
* | | | Merge pull request #449 from msgehard/rename_duplicate_test_methodsSantiago Pastorino2011-05-072-2/+2
|\ \ \ \
| * | | | Rename duplicate tests. There is now one failing test that was failing befor...Mike Gehard2011-05-072-2/+2
|/ / / /
* | | | Merge pull request #442 from jasonnoble/namespace_fixturesAaron Patterson2011-05-078-318/+323
|\ \ \ \
| * | | | 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
* | | | | Revert "Merge pull request #275 from pk-amooma/master"José Valim2011-05-072-14/+2
* | | | | Always expand */*José Valim2011-05-072-8/+5
* | | | | Fixes ticket #6379. Improved the handling of Accept headers containing */*.mathieuravaux2011-05-072-4/+12
* | | | | 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 patchJason2011-05-072-2/+32
|/ / / /
* | | | Merge pull request #435 from vijaydev/masterXavier Noria2011-05-071-5/+10
|\ \ \ \
| * | | | 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 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
|/ / / /
* | | | Update CHANGELOG.José Valim2011-05-071-0/+2
* | | | Merge pull request #343 from asanghi/ampmJosé Valim2011-05-072-4/+85
|\ \ \ \
| * | | | 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).Jason Weathered2011-04-172-0/+8
* | | | | | ADdd missing requires (thanks to @arunagw)José Valim2011-05-072-1/+2
* | | | | | Merge pull request #280 from jballanc/frozen-string-strip-tagsJosé Valim2011-05-072-1/+2
|\ \ \ \ \ \
| * | | | | | Fix for stripping tags from frozen strings.Joshua Ballanco2011-04-141-1/+1