| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | If you set a js_compressor, it means that you want shit compressed -- we ↵ | David Heinemeier Hansson | 2011-06-09 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | dont need a second option to turn that on | |||||
| * | | | | Make escape_javascript happy to handle SafeBuffers | Paul Gallagher | 2011-06-08 | 1 | -1/+1 | |
| | |_|/ |/| | | | | | | | | | | | * see GH#1553 * allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block | |||||
| * | | | Merge pull request #1547 from sikachu/safebuffer | José Valim | 2011-06-07 | 2 | -5/+9 | |
| |\ \ \ | | | | | | | | | Fix ActionPack tests on `master` | |||||
| | * | | | Add proper fix to `mail_to` helper. | Prem Sichanugrist | 2011-06-08 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | * Fix the problem on manipulating on the `ActiveSupport::SafeBuffer` * Make sure that we run `escape_javascript` on the `String`, to avoid unexpected behavior. | |||||
| | * | | | Adapt [823aa223efbac6ad4d31ea33402892267bb77cb4] to make sure we perform ↵ | Prem Sichanugrist | 2011-06-08 | 1 | -3/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | cloning before manipulation only on `OutputBuffer`. After the fragment rendering, `Builder` returns the `String` object instead of `ActionView::OutputBuffer`. Somehow the same procedure which was in [823aa223efbac6ad4d31ea33402892267bb77cb4] does not play nice with the String, and result in the fragment got lost. | |||||
| * | | | | Merge pull request #1542 from cmeiklejohn/dont_gsub_on_safebuffer | José Valim | 2011-06-07 | 1 | -1/+2 | |
| |\ \ \ \ | |/ / / |/| | | | Don't operate on the safebuffer, operate on a string and convert. | |||||
| | * | | | Don't operate on the safebuffer, operate on a string and convert. | Christopher Meiklejohn | 2011-06-07 | 1 | -1/+2 | |
| | | |/ | |/| | ||||||
| * | | | remove warning: assigned but unused variable | Santiago Pastorino | 2011-06-08 | 7 | -9/+4 | |
| | | | | ||||||
| * | | | Fragment caching needs to operate on the pure output, not the | Christopher Meiklejohn | 2011-06-07 | 1 | -1/+3 | |
| |/ / | | | | | | | safebuffer. | |||||
| * / | Update asset helpers to use `config.assets.prefix` | Joshua Peek | 2011-06-07 | 1 | -2/+2 | |
| |/ | | | Fixes #1489 | |||||
| * | Added missing assert to test checking form with namespaced isolated model ↵ | Piotr Sarnacki | 2011-06-07 | 1 | -1/+1 | |
| | | | | | and fixed helpers to work correctly in such case | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-06 | 9 | -14/+13 | |
| |\ | | | | | | | | | Conflicts: activerecord/RUNNING_UNIT_TESTS | |||||
| | * | Remove trailing white-spaces | Guillermo Iguaran | 2011-06-05 | 5 | -6/+5 | |
| | | | ||||||
| | * | some grammatical corrections | Vijay Dev | 2011-06-04 | 1 | -3/+3 | |
| | | | ||||||
| | * | Removing trailing white-spaces | Guillermo Iguaran | 2011-05-31 | 1 | -2/+2 | |
| | | | ||||||
| | * | The example in the API docs incorrectly indicated that form_for would use ↵ | Mark Roghelia | 2011-05-31 | 1 | -2/+2 | |
| | | | | | | | | | the same default route for both new and previously persisted records. The default path given in the example would have generated a routing error for new records. form_for actually uses polymorphic_path to determine which route to use based on the state of the record. The example has been updated to reflect the method's actual behavior. | |||||
| | * | Added missing quote in grouped_options_for_select example | diego | 2011-05-26 | 1 | -1/+1 | |
| | | | ||||||
| * | | Add backward compatibility for testing cookies | Andrew White | 2011-06-05 | 3 | -3/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit restores the ability to assign cookies for testing via @request.env['HTTP_COOKIE'] and @request.cookies, e.g: @request.env['HTTP_COOKIE'] = 'user_name=david' get :index assert_equal 'david', cookies[:user_name] and @request.cookies[:user_name] = 'david' get :index assert_equal 'david', cookies[:user_name] Assigning via cookies[] is the preferred method and will take precedence over the other two methods. This is so that cookies set in controller actions have precedence and are carried over between calls to get, post, etc. | |||||
| * | | Ensure cookie keys are strings | Andrew White | 2011-06-05 | 1 | -2/+3 | |
| | | | ||||||
| * | | Allow multiple sources in Sprockets helpers | Guillermo Iguaran | 2011-06-05 | 1 | -28/+34 | |
| | | | ||||||
| * | | Add missing require for cookies middleware | Andrew White | 2011-06-04 | 1 | -0/+1 | |
| | | | ||||||
| * | | Refactor ActionController::TestCase cookies | Andrew White | 2011-06-04 | 4 | -39/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning cookies for test cases should now use cookies[], e.g: cookies[:email] = 'user@example.com' get :index assert_equal 'user@example.com', cookies[:email] To clear the cookies, use clear, e.g: cookies.clear get :index assert_nil cookies[:email] We now no longer write out HTTP_COOKIE and the cookie jar is persistent between requests so if you need to manipulate the environment for your test you need to do it before the cookie jar is created. | |||||
| * | | Merge pull request #1447 from dmathieu/empty_route | Piotr Sarnacki | 2011-06-01 | 1 | -1/+3 | |
| |\ \ | | | | | | | Fix creating an empty route on 1.8. Closes #1210 | |||||
| | * | | fix creating an empty route on 1.8. Closes #1210 | Damien Mathieu | 2011-06-01 | 1 | -1/+3 | |
| | | | | ||||||
| * | | | Merge pull request #1448 from ernie/attr_internal_require | José Valim | 2011-06-01 | 1 | -0/+2 | |
| |\ \ \ | |/ / |/| | | Require attr_internal before using in ActionView::Helpers | |||||
| | * | | Require attr_internal before using in ActionView::Helpers | Ernie Miller | 2011-06-01 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Remove autoload for a couple of constants which don't exist anymore | brainopia | 2011-05-31 | 1 | -5/+0 | |
| | | | | ||||||
| * | | | Corrected some typos and American vs. Queen's English issues | Lee Reilly | 2011-05-29 | 1 | -4/+4 | |
| | | | | ||||||
| * | | | Merge pull request #1203 from dchelimsky/stringify-parameter-values-in-tests | José Valim | 2011-05-28 | 1 | -0/+19 | |
| |\ \ \ | | | | | | | | | Stringify param values in controller tests. | |||||
| | * | | | use to_param (and change method to name accordingly) | David Chelimsky | 2011-05-22 | 1 | -8/+8 | |
| | | | | | | | | | | | | | | | | | | | | | - exclude Rack::Test::UploadedFile to pass existing tests. Are there any other types we're missing? | |||||
| | * | | | Stringify param values in controller tests. | David Chelimsky | 2011-05-22 | 1 | -0/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reduces false positives that come from using ints in params in tests, which do not get converted to strings in the tests. In implementations going through rack, they do get converted to strings. - David Chelimsky and Sam Umbach | |||||
| * | | | | fixed asset_paths when called from sprockets for relative_url_root | jacott | 2011-05-28 | 2 | -11/+7 | |
| | | | | | ||||||
| * | | | | Merge pull request #1324 from dmathieu/no_error_on_invalid_format | José Valim | 2011-05-26 | 1 | -1/+1 | |
| |\ \ \ \ | | | | | | | | | | | Don't raise an exception if the format isn't recognized | |||||
| | * | | | | don't raise an exception if the format isn't recognized | dmathieu | 2011-05-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | Fixed while traveling to heuruko | |||||
| * | | | | | Merge pull request #1311 from kuldarkrabbi/master | José Valim | 2011-05-25 | 1 | -1/+0 | |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | action_view/template/handler.rb has been removed | |||||
| | * | | | | action_view/template/handler has been removed | Kuldar Krabbi | 2011-05-25 | 1 | -1/+0 | |
| | |/ / / | ||||||
| * | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-25 | 23 | -62/+62 | |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb | |||||
| | * | | | fix minor spelling mistakes in comments | Dmytrii Nagirniak | 2011-05-23 | 1 | -3/+3 | |
| | | | | | ||||||
| | * | | | Remove extra white spaces on ActionPack docs. | Sebastian Martinez | 2011-05-23 | 22 | -53/+53 | |
| | | | | | ||||||
| | * | | | Fixed documentation for scope with path. | Anuj Dutta | 2011-05-22 | 1 | -2/+2 | |
| | | | | | ||||||
| | * | | | fixes code highlight in shallow_path example | Diego Plentz | 2011-05-19 | 1 | -4/+4 | |
| | | | | | ||||||
| * | | | | Move SCSS generators and default templates from Rails to the Sass Railtie ↵ | tomhuda | 2011-05-24 | 1 | -19/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (d435726312601edb3ba6f97b34f562221f72c1f8). * Sass gem registers a compressor * Sass gem registers generators for assets and scaffold * Create a default stylesheet_engine ("css") for apps that remove the Sass gem | |||||
| * | | | | Change compressor API so that plugins can register default compressors for ↵ | tomhuda | 2011-05-24 | 1 | -3/+4 | |
| | | | | | | | | | | | | | | | | | their stylesheet or JS engines and still allow the user to turn off compression | |||||
| * | | | | corrected the ActionMailer tests which broke due to some code removed from ↵ | Josh Kalderimis | 2011-05-25 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | ActionPack | |||||
| * | | | | removed deprecated methods, and related tests, from ActionPack | Josh Kalderimis | 2011-05-24 | 9 | -108/+3 | |
| | | | | | ||||||
| * | | | | Redundant condition in compute_asset_host is redundant. | Ernie Miller | 2011-05-24 | 1 | -3/+3 | |
| | |_|/ |/| | | ||||||
| * | | | Remaining cleanup from changes to AssetTagHelper | tomhuda | 2011-05-24 | 4 | -12/+9 | |
| | | | | ||||||
| * | | | Make sure that Sprockets::Helpers::RailsHelper can be found | wycats | 2011-05-23 | 2 | -1/+8 | |
| | | | | ||||||
| * | | | Merge pull request #1241 from smartinez87/extra-space | Santiago Pastorino | 2011-05-23 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | Remove extra white-space on exception message. | |||||
| | * | | | Remove extra white-space on some exception messages. | Sebastian Martinez | 2011-05-23 | 1 | -1/+1 | |
| | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |