| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #1738 from gazay/3-1-stable-change-nokogiri-version | Santiago Pastorino | 2011-06-16 | 1 | -1/+1 |
|\ |
|
| * | Change version of nokogiri gem | Alexey Gaziev | 2011-06-17 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #1737 from SAP-Oxygen/master-app_plugins_ordering_patch | José Valim | 2011-06-16 | 1 | -1/+1 |
|\ |
|
| * | Patch for #1458 - [3.1.0.rc1] App plugins initialized before engines | Joseph Wong | 2011-06-16 | 1 | -1/+1 |
|/ |
|
* | Perf fix - Use an instance variable instead of a class_attribute. Thanks @jos... | Jon Leighton | 2011-06-16 | 1 | -8/+4 |
* | safe_concat should not work on dirty buffers. | José Valim | 2011-06-16 | 2 | -4/+20 |
* | Fix safe buffer by adding a dirty status. | José Valim | 2011-06-16 | 2 | -18/+55 |
* | Make the API for compression consistent between JS and CSS. By default, user... | wycats | 2011-06-16 | 2 | -5/+6 |
* | Merge pull request #1733 from SAP-Oxygen/master-plugins_in_engine_patch | José Valim | 2011-06-16 | 2 | -8/+10 |
|\ |
|
| * | Cherry-picking patch for https://github.com/rails/rails/issues/1460 | Joseph Wong | 2011-06-16 | 2 | -8/+10 |
* | | Merge pull request #1731 from vijaydev/plugin_name_change | Xavier Noria | 2011-06-16 | 1 | -2/+2 |
|\ \ |
|
| * | | replace dev.ror.com plugin url with a dummy one | Vijay Dev | 2011-06-16 | 1 | -2/+2 |
|/ / |
|
* | | Use html_safe | Santiago Pastorino | 2011-06-16 | 1 | -2/+2 |
* | | Remove usage of memoizable from ActionPack. | José Valim | 2011-06-16 | 2 | -10/+9 |
* | | Update CHANGELOG, improve message. | José Valim | 2011-06-16 | 2 | -2/+4 |
* | | Merge pull request #1727 from ihower/improve_legacy_wild_controller_route | José Valim | 2011-06-16 | 2 | -2/+2 |
|\ \ |
|
| * | | Also change the default route comment | Wen-Tien Chang | 2011-06-16 | 1 | -1/+1 |
| * | | Improve the legacy wild controller route in app templates | Wen-Tien Chang | 2011-06-16 | 1 | -1/+1 |
* | | | Merge pull request #1725 from arunagw/mysql_bump | José Valim | 2011-06-16 | 2 | -2/+2 |
|\ \ \
| |/ /
|/| | |
|
| * | | Bump mysql2 to 0.3.5 | Arun Agrawal | 2011-06-16 | 2 | -2/+2 |
|/ / |
|
* / | Bump mysql2 up | Santiago Pastorino and José Ignacio Costa | 2011-06-16 | 2 | -2/+2 |
|/ |
|
* | Deprecate memoizable. | José Valim | 2011-06-15 | 3 | -7/+28 |
* | load_generators from engine should also handle self automatically. | José Valim | 2011-06-15 | 1 | -3/+3 |
* | Merge pull request #1711 from daeltar/master | José Valim | 2011-06-15 | 1 | -1/+1 |
|\ |
|
| * | Use assert_equal instead of assert in uploaded file test. | Lukáš Konarovský | 2011-06-15 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #1707 from dmathieu/memoize | José Valim | 2011-06-15 | 2 | -1/+19 |
|\ |
|
| * | allow boolean last argument in memoized methods - Closes #1704 | Damien Mathieu | 2011-06-15 | 1 | -1/+5 |
| * | Failing test to show problem when last argument of a memoized method is true | Brian Underwood | 2011-06-15 | 1 | -0/+14 |
* | | simplify to only one condition | Damien Mathieu | 2011-06-15 | 1 | -5/+1 |
|/ |
|
* | Make MissingTranslation exception handler respect :rescue_format | Andrew White | 2011-06-15 | 2 | -1/+13 |
* | Fix appending sprockets paths | Joshua Peek | 2011-06-14 | 1 | -1/+6 |
* | Merge pull request #1698 from bagwanpankaj/master | Jon Leighton | 2011-06-14 | 1 | -1/+1 |
|\ |
|
| * | Removed warning while running test with ruby 1.9.2 | bagwanpankaj | 2011-06-14 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #1689 from dmathieu/utf8-filename | José Valim | 2011-06-14 | 2 | -1/+18 |
|\ |
|
| * | all requests are utf-8. Don't use the external encoding. | Damien Mathieu | 2011-06-14 | 2 | -9/+3 |
| * | encode the uploaded file's name in the default external encoding - Closes #869 | Damien Mathieu | 2011-06-14 | 2 | -1/+24 |
|/ |
|
* | Add Gemfile dependency for require_relative on mri18. This is a dependency of... | Jon Leighton | 2011-06-13 | 1 | -0/+3 |
* | Remove obsolete compatibility module | Andrew White | 2011-06-13 | 1 | -11/+0 |
* | Rename Time#whole_* to Time#all_* [thanks Pratik!] | David Heinemeier Hansson | 2011-06-13 | 3 | -16/+16 |
* | Added Time#whole_day/week/quarter/year as a way of generating ranges (example... | David Heinemeier Hansson | 2011-06-13 | 3 | -1/+48 |
* | Added instance_accessor: false as an option to Class#cattr_accessor and frien... | David Heinemeier Hansson | 2011-06-13 | 3 | -4/+14 |
* | Merge pull request #1676 from neerajdotname/make_test_name_meaningful | Santiago Pastorino | 2011-06-13 | 1 | -1/+1 |
|\ |
|
| * | Remove "is_assed" with something more meaningful | Neeraj Singh | 2011-06-13 | 1 | -1/+1 |
* | | Merge pull request #1654 from ganeshkumar/test_cases | Santiago Pastorino | 2011-06-13 | 1 | -1/+0 |
|\ \ |
|
| * | | removed duplicate code | ganesh | 2011-06-11 | 1 | -1/+0 |
* | | | Pass mass-assignment options to nested models - closes #1673. | Andrew White | 2011-06-13 | 4 | -18/+276 |
* | | | Rename tests to reflect associations | Andrew White | 2011-06-13 | 1 | -30/+30 |
* | | | Merge pull request #1672 from ryanb/namespace_engine_assets | José Valim | 2011-06-13 | 3 | -19/+37 |
|\ \ \
| |_|/
|/| | |
|
| * | | namespace engine assets | Ryan Bates | 2011-06-12 | 3 | -19/+37 |
|/ / |
|
* | | Add support for using an ARCONFIG environment variable to specify the locatio... | Jon Leighton | 2011-06-12 | 2 | -4/+12 |