Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make scaffold_controller generator generate code for JSON response instead ↵ | Prem Sichanugrist | 2011-04-10 | 2 | -14/+16 |
| | | | | | | | | of XML It seems like a lot of people are using JSON in their API more than XML nowadays, so Rails should follow that convention by providing the JSON format block in scaffold_controller by default. This patch has been requested by DHH | ||||
* | moving sqlite_adapter_tests to sqlite3_adapter_test so that the tests are ↵ | Aaron Patterson | 2011-04-08 | 2 | -229/+215 |
| | | | | actually run. :bomb: | ||||
* | make turn a soft dependency. generate a Gemfile that contains turn and ↵ | Aaron Patterson | 2011-04-08 | 3 | -7/+14 |
| | | | | require turn if it is available | ||||
* | Make csrf_meta_tags use the tag helper | James Robinson | 2011-04-08 | 2 | -9/+9 |
| | | | | Improved formatting of csrf_helper and improved test coverage | ||||
* | Merge branch 'master' of github.com:rails/rails | Aaron Patterson | 2011-04-07 | 2 | -4/+4 |
|\ | | | | | | | | | | | | | | | | | | | * 'master' of github.com:rails/rails: Cache flash now Revert "Use freeze instead of close!" Revert "Eagerly load Signed and Permanent cookies" cookies here Eagerly load Signed and Permanent cookies Use freeze instead of close! | ||||
| * | Cache flash now | Santiago Pastorino | 2011-04-07 | 1 | -1/+1 |
| | | |||||
| * | Revert "Use freeze instead of close!" | Santiago Pastorino | 2011-04-07 | 3 | -11/+14 |
| | | | | | | | | This reverts commit 29592a7f09dda2e7e1e0a915d9230fe6a9b5c0af. | ||||
| * | Revert "Eagerly load Signed and Permanent cookies" | Santiago Pastorino | 2011-04-07 | 1 | -17/+10 |
| | | | | | | | | This reverts commit dffeda377021ba8691381195f5a2889f8e040b93. | ||||
| * | cookies here | Santiago Pastorino | 2011-04-07 | 1 | -3/+3 |
| | | |||||
| * | Eagerly load Signed and Permanent cookies | Santiago Pastorino | 2011-04-07 | 1 | -10/+17 |
| | | |||||
| * | Use freeze instead of close! | Santiago Pastorino | 2011-04-06 | 3 | -14/+11 |
| | | |||||
* | | many args does not make sense with the current implementation because of how ↵ | Aaron Patterson | 2011-04-06 | 1 | -10/+0 |
| | | | | | | | | `use` works | ||||
* | | getting the flash hash under test | Aaron Patterson | 2011-04-06 | 2 | -0/+104 |
| | | |||||
* | | favor composition over inheritance, have FlashHash delegate to a Hash | Aaron Patterson | 2011-04-06 | 2 | -11/+44 |
|/ | |||||
* | CookieJar should prefer composition over inheritance | Aaron Patterson | 2011-04-06 | 1 | -6/+10 |
| | |||||
* | Delete useless arguments | Santiago Pastorino | 2011-04-06 | 1 | -6/+6 |
| | |||||
* | Delete useless env variable | Santiago Pastorino | 2011-04-06 | 1 | -9/+3 |
| | |||||
* | Add tests to verify that signed and permanent cookies raises if someone tries | Santiago Pastorino | 2011-04-06 | 1 | -0/+51 |
| | | | | | to modify the cookies when it was already streamed back to the client or converted to HTTP headers | ||||
* | Make process reuse the env var passed as argument | Santiago Pastorino | 2011-04-06 | 2 | -5/+12 |
| | |||||
* | raise if someone tries to modify the cookies when it was already streamed ↵ | Santiago Pastorino | 2011-04-06 | 2 | -0/+63 |
| | | | | back to the client or converted to HTTP headers | ||||
* | Add ClosedError message to the initializer | Santiago Pastorino | 2011-04-06 | 3 | -5/+10 |
| | |||||
* | do not return html safe strings from auto_link | Aaron Patterson | 2011-04-05 | 2 | -7/+13 |
| | |||||
* | added find_zone and find_zone! to AS timezones and changed the AS Railtie to ↵ | Josh Kalderimis | 2011-04-05 | 6 | -18/+61 |
| | | | | | | use find_zone! as well as adding Railtie tests Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Raise on invalid timezone | Marc-Andre Lafortune | 2011-04-05 | 3 | -14/+39 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | Disable IdentityMap in log tests, it's not important and when running tests ↵ | Emilio Tagua | 2011-04-05 | 1 | -0/+3 |
| | | | | | | rake task it logs more messages in the tested buffer. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | AM register_interceptor and register_observer only constantize if the ↵ | Josh Kalderimis | 2011-04-06 | 1 | -2/+2 |
| | | | | argument is a String | ||||
* | Rename test directory to match code directory | John Firebaugh | 2011-04-06 | 2 | -0/+0 |
| | | | | Hopefully "serializeration" is not an in joke that I missed. | ||||
* | raise if someone tries to modify the flash when it was already streamed back ↵ | Santiago Pastorino | 2011-04-05 | 2 | -1/+69 |
| | | | | to the client or converted to HTTP headers | ||||
* | Destroying records via nested attributes works independent of reject_if: | Durran Jordan | 2011-04-05 | 2 | -0/+9 |
| | | | | | | | | | | - When a :_destroy truthiness is provided in the attributes hash, the record should get destroyed regardless of the result of the proc or method supplied to :reject_if. (If :allow_destroy is true) [#6006 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | remove AM delegating register_observer and register_interceptor to Mail and ↵ | Josh Kalderimis | 2011-04-04 | 4 | -5/+138 |
| | | | | | | instead implement smarter versions allowing for string class names, also added proper Railtie support with tests. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Add log message when loading records from Identity Map. | Emilio Tagua | 2011-04-04 | 2 | -1/+17 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Use IM when trying to load records using ID. | Emilio Tagua | 2011-04-04 | 6 | -9/+29 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Add railties to the LOAD_PATH if running from a Rails checkout | Santiago Pastorino | 2011-04-03 | 1 | -4/+2 |
| | |||||
* | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-04-03 | 29 | -99/+119 |
|\ | |||||
| * | added .'s to headings in the initialization textile page | orta | 2011-04-03 | 1 | -3/+2 |
| | | |||||
| * | s/ERb/ERB/g (part II) | Akira Matsuda | 2011-04-03 | 6 | -8/+8 |
| | | |||||
| * | s/ERb/ERB/g | Akira Matsuda | 2011-04-03 | 10 | -18/+18 |
| | | | | | | | | | | The author of ERB sais, his eRuby implementation was originally named "ERb/ERbLight" and then renamed to "ERB" when started bundled as a Ruby standard lib. http://www2a.biglobe.ne.jp/~seki/ruby/erb.html | ||||
| * | Trivial fix to HTTP Digest auth MD5 example | Jon Cooper | 2011-03-31 | 1 | -1/+1 |
| | | |||||
| * | fix typo | burningTyger | 2011-04-01 | 1 | -1/+1 |
| | | |||||
| * | Explain in the method doc that you need to call respond_to at the class ↵ | Amaia Castro | 2011-03-31 | 1 | -0/+3 |
| | | | | | | | | level in order to use respond_with. | ||||
| * | Grammar tweaks to the guides guidelines | Josiah Ivey | 2011-03-31 | 1 | -9/+10 |
| | | |||||
| * | Symbol to proc is preferred over longer form of map | Ryan Bigg | 2011-03-31 | 1 | -1/+1 |
| | | |||||
| * | Cleanup of named_scope documentation | Ryan Bigg | 2011-03-31 | 1 | -8/+9 |
| | | |||||
| * | Fix typo in named_scope documentation | Ryan Bigg | 2011-03-31 | 1 | -1/+1 |
| | | |||||
| * | add space to conform with style | Eadz | 2011-03-31 | 1 | -1/+1 |
| | | |||||
| * | Documented undocumented feature: Class methods on your model are ↵ | Eadz | 2011-03-31 | 1 | -0/+22 |
| | | | | | | | | automatically available on scopes | ||||
| * | Minor rephrasing to improve grammar and readability. | mhutchin | 2011-03-29 | 1 | -1/+1 |
| | | |||||
| * | Fixed typo and improved readability. | mhutchin | 2011-03-29 | 1 | -1/+2 |
| | | |||||
| * | Fix formatting and broken markup | John Firebaugh | 2011-03-28 | 1 | -11/+10 |
| | | |||||
| * | Fix grammar, formatting, and cross references | John Firebaugh | 2011-03-28 | 1 | -8/+8 |
| | |