aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #1733 from SAP-Oxygen/master-plugins_in_engine_patchJosé Valim2011-06-162-8/+10
|\ \ \
| * | | Cherry-picking patch for https://github.com/rails/rails/issues/1460Joseph Wong2011-06-162-8/+10
* | | | Merge pull request #1731 from vijaydev/plugin_name_changeXavier Noria2011-06-161-2/+2
|\ \ \ \
| * | | | replace dev.ror.com plugin url with a dummy oneVijay Dev2011-06-161-2/+2
|/ / / /
* | | | Use html_safeSantiago Pastorino2011-06-161-2/+2
* | | | Remove usage of memoizable from ActionPack.José Valim2011-06-162-10/+9
* | | | Update CHANGELOG, improve message.José Valim2011-06-162-2/+4
* | | | Merge pull request #1727 from ihower/improve_legacy_wild_controller_routeJosé Valim2011-06-162-2/+2
|\ \ \ \
| * | | | Also change the default route commentWen-Tien Chang2011-06-161-1/+1
| * | | | Improve the legacy wild controller route in app templatesWen-Tien Chang2011-06-161-1/+1
* | | | | Merge pull request #1725 from arunagw/mysql_bumpJosé Valim2011-06-162-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bump mysql2 to 0.3.5Arun Agrawal2011-06-162-2/+2
|/ / / /
* / / / Bump mysql2 upSantiago Pastorino and José Ignacio Costa2011-06-162-2/+2
|/ / /
* | | Deprecate memoizable.José Valim2011-06-153-7/+28
* | | load_generators from engine should also handle self automatically.José Valim2011-06-151-3/+3
* | | Merge pull request #1711 from daeltar/masterJosé Valim2011-06-151-1/+1
|\ \ \
| * | | Use assert_equal instead of assert in uploaded file test.Lukáš Konarovský2011-06-151-1/+1
|/ / /
* | | Merge pull request #1707 from dmathieu/memoizeJosé Valim2011-06-152-1/+19
|\ \ \
| * | | allow boolean last argument in memoized methods - Closes #1704Damien Mathieu2011-06-151-1/+5
| * | | Failing test to show problem when last argument of a memoized method is trueBrian Underwood2011-06-151-0/+14
* | | | simplify to only one conditionDamien Mathieu2011-06-151-5/+1
|/ / /
* | | Make MissingTranslation exception handler respect :rescue_formatAndrew White2011-06-152-1/+13
* | | Fix appending sprockets pathsJoshua Peek2011-06-141-1/+6
* | | Merge pull request #1698 from bagwanpankaj/masterJon Leighton2011-06-141-1/+1
|\ \ \
| * | | Removed warning while running test with ruby 1.9.2bagwanpankaj2011-06-141-1/+1
|/ / /
* | | Merge pull request #1689 from dmathieu/utf8-filenameJosé Valim2011-06-142-1/+18
|\ \ \
| * | | all requests are utf-8. Don't use the external encoding.Damien Mathieu2011-06-142-9/+3
| * | | encode the uploaded file's name in the default external encoding - Closes #869Damien Mathieu2011-06-142-1/+24
|/ / /
* | | Add Gemfile dependency for require_relative on mri18. This is a dependency of...Jon Leighton2011-06-131-0/+3
* | | Remove obsolete compatibility moduleAndrew White2011-06-131-11/+0
* | | Rename Time#whole_* to Time#all_* [thanks Pratik!]David Heinemeier Hansson2011-06-133-16/+16
* | | Added Time#whole_day/week/quarter/year as a way of generating ranges (example...David Heinemeier Hansson2011-06-133-1/+48
* | | Added instance_accessor: false as an option to Class#cattr_accessor and frien...David Heinemeier Hansson2011-06-133-4/+14
* | | Merge pull request #1676 from neerajdotname/make_test_name_meaningfulSantiago Pastorino2011-06-131-1/+1
|\ \ \
| * | | Remove "is_assed" with something more meaningfulNeeraj Singh2011-06-131-1/+1
* | | | Merge pull request #1654 from ganeshkumar/test_casesSantiago Pastorino2011-06-131-1/+0
|\ \ \ \
| * | | | removed duplicate codeganesh2011-06-111-1/+0
* | | | | Pass mass-assignment options to nested models - closes #1673.Andrew White2011-06-134-18/+276
* | | | | Rename tests to reflect associationsAndrew White2011-06-131-30/+30
* | | | | Merge pull request #1672 from ryanb/namespace_engine_assetsJosé Valim2011-06-133-19/+37
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | namespace engine assetsRyan Bates2011-06-123-19/+37
|/ / / /
* | | | Add support for using an ARCONFIG environment variable to specify the locatio...Jon Leighton2011-06-122-4/+12
* | | | Oops, this should have been in the last commit :zap:Jon Leighton2011-06-121-1/+1
* | | | Make assert_no_queries literally enforce that there are no queries. As in, no...Jon Leighton2011-06-122-15/+4
* | | | If we're going to use a global variable, let's at least namespace itJon Leighton2011-06-122-10/+10
* | | | Replace inline lambdas with named methodsJon Leighton2011-06-121-29/+42
* | | | Refactor tests to be less brittleJon Leighton2011-06-123-28/+74
* | | | Move BEGIN and COMMIT into IGNORED_SQL rather than having them as a special c...Jon Leighton2011-06-122-2/+1
* | | | Don't wrap operations on collection associations in transactions when they ar...benedikt2011-06-122-3/+54
* | | | Define ActiveSupport#to_param as to_str - closes #1663Andrew White2011-06-123-1/+19