Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | call binmode on the tempfile for Ruby 1.8 compatibility | Aaron Patterson | 2012-02-27 | 1 | -1/+2 | |
| | | | ||||||
* | | | Merge pull request #5190 from rafaelfranca/fix-393-3-2-stable | Aaron Patterson | 2012-02-27 | 3 | -38/+38 | |
|\ \ \ | | | | | | | | | [3-2-stable] Add a new line after the textarea opening tag. | |||||
| * | | | Add a new line after the textarea opening tag. | Rafael Mendonça França | 2012-02-27 | 3 | -38/+38 | |
| | | | | | | | | | | | | | | | | Closes #393 | |||||
* | | | | Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bug | Aaron Patterson | 2012-02-27 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | Binary mode window bug | |||||
| * | | | Fixing Windows asset tag helper test failure | Ralph Shnelvar | 2012-02-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In asset_tag_helper_test.rb there is an assert on the number of bytes in a concatenated file. This test failed because Windows converts \n to \r\n as the default for "w". This is different than in *nix systems where there is no conversion done. THe test that failed was test_caching_stylesheet_link_tag_when_caching_on Using bin mode fixes this behavior on windows and makes no change on the *nix systems. | |||||
* | | | | Revert "No need to pass options which is never used" | Rafael Mendonça França | 2012-02-26 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Options is needed for some Rails extensions to determine when referential integrity should be disabled This reverts commit bcb466c543451dce69403aaae047295758589d8e. Fixes #5052 | |||||
* | | | | Adding tests for non-optional glob parameters | Andrew White | 2012-02-26 | 1 | -2/+27 | |
|/ / / | ||||||
* | | | Fix typo in match :to docs | Justin Woodbridge | 2012-02-25 | 1 | -1/+1 | |
| | | | ||||||
* | | | Fixed typo in composed_of example with Money#<=>, was comparing amount ↵ | Noah Hendrix | 2012-02-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | itself instead of other_money.amount | |||||
* | | | Merge pull request #5170 from arunagw/3-2-stable | Santiago Pastorino | 2012-02-25 | 1 | -3/+3 | |
|\ \ \ | | | | | | | | | assert => assert_equal | |||||
| * | | | assert => assert_equal | Arun Agrawal | 2012-02-25 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | Merge pull request #5166 from arunagw/3-2-stable | Xavier Noria | 2012-02-25 | 1 | -4/+3 | |
|\| | | | | | | | | | | | 3 2 stable | |||||
| * | | | Checking headers in a better way. as doing here | Arun Agrawal | 2012-02-25 | 1 | -4/+3 | |
|/ / / | | | | | | | | | | 406ece4729e8fd81f156bcb3fce16e938522466e | |||||
* | | | Merge pull request #5164 from arunagw/build_fix_ruby187-p358 | Xavier Noria | 2012-02-25 | 1 | -2/+7 | |
|\ \ \ | | | | | | | | | Build fix ruby187 p358 | |||||
| * | | | Build fix for ruby187-p358 | Arun Agrawal | 2012-02-25 | 1 | -2/+7 | |
|/ / / | ||||||
* | | | Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare | Aaron Patterson | 2012-02-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | Fix usage of psql in db:test:prepare | |||||
* | | | Avoid inspecting the whole route set, closes #1525 | José Valim | 2012-02-23 | 1 | -0/+6 | |
| | | | ||||||
* | | | Merge pull request #5087 from pwnall/no_view_logger | Aaron Patterson | 2012-02-22 | 1 | -3/+1 | |
|\ \ \ | | | | | | | | | Remove reference to config.action_view.logger from Rails configuration guide | |||||
| * | | | Removed (outdated?) config.action_view.logger from configuration guide. | Victor Costan | 2012-02-19 | 1 | -3/+1 | |
| | | | | ||||||
* | | | | Merge pull request #5084 from johndouthat/patch-1 | Aaron Patterson | 2012-02-22 | 1 | -2/+1 | |
| |/ / |/| | | | | | | | | Remove reference to rails_legacy_mapper, which isn't compatible with 3.2... | |||||
* | | | Fix CHANGELOG | Santiago Pastorino | 2012-02-22 | 1 | -2/+2 | |
| | | | ||||||
* | | | Add CHANGELOG entry | Santiago Pastorino | 2012-02-22 | 1 | -0/+2 | |
| | | | ||||||
* | | | format lookup for partials is derived from the format in which the template ↵ | Santiago Pastorino | 2012-02-22 | 11 | -36/+25 | |
| | | | | | | | | | | | | | | | | | | is being rendered Closes #5025 part 2 | |||||
* | | | bumping up arel | Aaron Patterson | 2012-02-21 | 1 | -1/+1 | |
| | | | ||||||
* | | | prepared statements can be disabled | Aaron Patterson | 2012-02-21 | 8 | -30/+56 | |
| | | | ||||||
* | | | tag bind params with a bind param object | Aaron Patterson | 2012-02-21 | 3 | -3/+3 | |
| | | | ||||||
* | | | more ruby 2.0 respond_to? changes | Aaron Patterson | 2012-02-21 | 1 | -1/+1 | |
| | | | ||||||
* | | | ruby 2.0 makes protected methods return false for respond_to, so pass true ↵ | Aaron Patterson | 2012-02-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | as the second param | |||||
* | | | fix bad docs from f373f296 [ci skip] | Vijay Dev | 2012-02-21 | 1 | -3/+3 | |
| | | | ||||||
* | | | Don't wrap the raise with ensure | Santiago Pastorino | 2012-02-21 | 2 | -10/+12 | |
| | | | ||||||
* | | | Merge pull request #5096 from lawso017/master | Aaron Patterson | 2012-02-21 | 2 | -19/+43 | |
| | | | | | | | | | | | | Restoring ability to derive id/sequence from tables with nonstandard sequences for primary keys | |||||
* | | | Restore lookup formats to the previous value after searching for the failing ↵ | Santiago Pastorino | 2012-02-21 | 2 | -2/+5 | |
| | | | | | | | | | | | | view | |||||
* | | | Add CHANGELOG entry | Santiago Pastorino | 2012-02-21 | 1 | -0/+2 | |
| | | | ||||||
* | | | Merge pull request #5106 from kennyj/fix_warnings_20120210 | Santiago Pastorino | 2012-02-21 | 6 | -27/+29 | |
|\ \ \ | |_|/ |/| | | [3-2-stable] Fix some warnings | |||||
| * | | Fix some warnings on 3-2-stable | kennyj | 2012-02-21 | 6 | -27/+29 | |
|/ / | ||||||
* | | Fix a failing test | Santiago Pastorino | 2012-02-20 | 1 | -0/+2 | |
| | | ||||||
* | | Use the right format when a partial is missing. | Santiago Pastorino | 2012-02-20 | 3 | -0/+9 | |
| | | | | | | | | Closes #5025 | |||||
* | | Merge pull request #5101 from ckdake/ckdake_actionview_handler_reset | José Valim | 2012-02-20 | 2 | -0/+7 | |
|\ \ | | | | | | | Reset memoized hash keys when new ActionView::Template handler is registered | |||||
| * | | Reset memoized hash keys when new entry added | Chris Kelly | 2012-02-20 | 2 | -0/+7 | |
|/ / | ||||||
* | | search private / protected methods in trunk ruby | Aaron Patterson | 2012-02-20 | 1 | -1/+1 | |
| | | ||||||
* | | sync __run_callbacks with ruby-trunk | Sokolov Yura | 2012-02-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/34580 In this revision behavior of respond_to? had changed: now to ask about protected method one should pass second argument `true` | |||||
* | | Remove fixture files with Windows incompatible filenames | Andrew White | 2012-02-20 | 13 | -39/+88 | |
|/ | | | | | | Windows doesn't allow `\ / : * ? " < > |` in filenames so create the fixture files at runtime and ignore the incompatible ones when running on Windows. | |||||
* | fix a typo [ci skip] | Vijay Dev | 2012-02-18 | 1 | -1/+1 | |
| | ||||||
* | Documenting the :inverse_of option for associations | Mike Gunderloy | 2012-02-18 | 1 | -0/+99 | |
| | ||||||
* | fix spacer template example | Sergey Nartimov | 2012-02-18 | 1 | -1/+1 | |
| | ||||||
* | Update Time#change docs to reflect the options it uses | Eric Oestrich | 2012-02-18 | 1 | -1/+1 | |
| | | | | [ci skip] | |||||
* | Fix actionpack readme weblog example | Alexey Vakhov | 2012-02-18 | 1 | -1/+1 | |
| | ||||||
* | Merge pull request #5081 from arunagw/fix_ar_test | Xavier Noria | 2012-02-18 | 1 | -1/+5 | |
|\ | | | | | Fix ar test | |||||
| * | fix test with ruby 187-p358 | Arun Agrawal | 2012-02-18 | 1 | -1/+5 | |
|/ | ||||||
* | Simplify regexp | Andrew White | 2012-02-17 | 1 | -1/+1 | |
| |