aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * document server optionsVijay Dev2011-06-121-0/+6
| * more command guide changesVijay Dev2011-06-121-8/+6
| * make some changes to the command line guideVijay Dev2011-06-111-7/+13
| * minor changes in templates guideVijay Dev2011-06-111-6/+4
| * add missing end in exampleVijay Dev2011-06-111-0/+1
| * favor includes over old AR wayVijay Dev2011-06-111-1/+1
| * fixed incorrect command usage. (This section needs to be updated in any case).Vijay Dev2011-06-111-1/+1
| * minor fixes in action view guideVijay Dev2011-06-111-3/+3
* | Attributes on scaffold and model generators default to string.José Valim2011-06-175-17/+24
* | Merge pull request #1751 from guilleiguaran/mysql-0-3-6Santiago Pastorino2011-06-172-2/+2
|\ \
| * | Bump to mysql2 0.3.6Guillermo Iguaran2011-06-172-2/+2
|/ /
* | Merge pull request #1748 from bogdan/select_form_helpers_refactorJosé Valim2011-06-171-25/+10
|\ \
| * | Select tag helpers: remove some code dupsBogdan Gusiev2011-06-171-25/+10
* | | Add require 'pathname' as it has not already been required in some circumstancesJon Leighton2011-06-171-0/+1
|/ /
* | AS guide: expands safe string docs regarding destructive methods, coercion, c...Xavier Noria2011-06-171-2/+20
* | Merge pull request #1636 from metaskills/upstream/3-1-stableAaron Patterson2011-06-171-0/+1
|\ \
| * | Allow the connection pool's #table_exists? method to give the connections #ta...Ken Collins2011-06-101-0/+1
* | | Merge pull request #1738 from gazay/3-1-stable-change-nokogiri-versionSantiago Pastorino2011-06-161-1/+1
|\ \ \
| * | | Change version of nokogiri gemAlexey Gaziev2011-06-171-1/+1
|/ / /
* | | Merge pull request #1737 from SAP-Oxygen/master-app_plugins_ordering_patchJosé Valim2011-06-161-1/+1
|\ \ \
| * | | Patch for #1458 - [3.1.0.rc1] App plugins initialized before enginesJoseph Wong2011-06-161-1/+1
|/ / /
* | | Perf fix - Use an instance variable instead of a class_attribute. Thanks @jos...Jon Leighton2011-06-161-8/+4
* | | safe_concat should not work on dirty buffers.José Valim2011-06-162-4/+20
* | | Fix safe buffer by adding a dirty status.José Valim2011-06-162-18/+55
* | | Make the API for compression consistent between JS and CSS. By default, user...wycats2011-06-162-5/+6
* | | 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
|/ / /